Merge pull request #24 from ehelms/update-to-1.2.1

Update to 1.2.1

.github/workflows/main.yml

@@ -140,3 +140,18 @@ jobs:
         env:
           DRIVER_NAME: docker
         run: ./tests/molecule.sh
+
+  execution_environment:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v3
+        with:
+          python-version: "3.8"
+          cache: 'pip'
+          cache-dependency-path: '**/requirements*.txt'
+      - name: Install dependencies
+        run: pip install --upgrade ansible-core ansible-builder ansible-navigator
+      - name: Build EE
+        run: ansible-builder build -v 3 -t test-ee:latest -f meta/execution-environment.yml

CHANGELOG.rst

@@ -5,6 +5,14 @@ redhat.satellite-operations Release Notes
 .. contents:: Topics
 
 
+v1.2.1
+======
+
+Bugfixes
+--------
+
+- fix parsing of openssl certificate subject for EL7 and EL8
+
 v1.2.0
 ======
 

Makefile

@@ -6,7 +6,7 @@ MANIFEST := build/collections/ansible_collections/$(NAMESPACE)/$(NAME)/MANIFEST.
 
 ROLES := $(foreach ROLE,$(wildcard roles/*),$(filter-out roles/fake_installer_rpm, $(wildcard roles/*)))
 PLUGIN_TYPES := $(filter-out __%,$(notdir $(wildcard plugins/*)))
-METADATA := galaxy.yml LICENSE README.md meta/runtime.yml requirements.txt changelogs/changelog.yaml CHANGELOG.rst
+METADATA := galaxy.yml LICENSE README.md meta/runtime.yml requirements.txt changelogs/changelog.yaml CHANGELOG.rst meta/execution-environment.yml
 $(foreach PLUGIN_TYPE,$(PLUGIN_TYPES),$(eval _$(PLUGIN_TYPE) := $(filter-out %__init__.py,$(wildcard plugins/$(PLUGIN_TYPE)/*.py))))
 DEPENDENCIES := $(METADATA) $(foreach PLUGIN_TYPE,$(PLUGIN_TYPES),$(_$(PLUGIN_TYPE))) $(foreach ROLE,$(ROLES),$(filter-out $(ROLE)/molecule/%, $(wildcard $(ROLE)/*/*))) $(foreach ROLE,$(ROLES),$(ROLE)/README.md)
 

changelogs/changelog.yaml

@@ -40,3 +40,8 @@ releases:
       minor_changes:
       - add HTTP proxy support for cloud connector
     release_date: '2022-05-16'
+  1.2.1:
+    changes:
+      bugfixes:
+      - fix parsing of openssl certificate subject for EL7 and EL8
+    release_date: '2022-05-23'

galaxy.yml

@@ -11,7 +11,7 @@ authors:
   - "Kyle Williams <[email protected]>"
   - "Matthias Dellweg <[email protected]>"
   - "willtome <[email protected]>"
-version: "1.2.0"
+version: "1.2.1"
 license:
   - "GPL-3.0-or-later"
 tags:

meta/execution-environment.yml

@@ -0,0 +1,8 @@
+---
+version: 1
+
+build_arg_defaults:
+  EE_BASE_IMAGE: 'quay.io/ansible/ansible-runner:latest'
+
+dependencies:
+  python: ../requirements.txt

roles/cloud_connector/tasks/main.yml

@@ -56,7 +56,7 @@
     force_basic_auth: true
     body_format: json
   vars:
-    client_id: "{{ cert_output.stdout.replace('subject= /CN=', '') }}"
+    client_id: "{{ cert_output.stdout.replace('subject= /CN=', '').replace('subject=CN = ', '') }}"
 
 - name: Configure HTTP proxy
   include: http_proxy.yml