From c34e2b6a35729013290b43361cdf78e812dfb12a Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Wed, 4 Jan 2023 10:10:38 +0100
Subject: [PATCH 01/18] bump version to 1.4.0-dev

---
 galaxy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/galaxy.yml b/galaxy.yml
index 1f9daa8..21ada27 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -12,7 +12,7 @@ authors:
   - "Matthias Dellweg <2500@gmx.de>"
   - "Robert Rettig <robert@rettig.bayern>"
   - "willtome <willtome@gmail.com>"
-version: "1.3.0"
+version: "1.4.0-dev"
 license:
   - "GPL-3.0-or-later"
 tags:

From a937b62eb809cb2ff61aa85f3b6a387f813d64b8 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Thu, 26 Jan 2023 12:37:23 +0100
Subject: [PATCH 02/18] document packaged versions of the collection

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index f99910d..833bb3c 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ Ansible only supports Python 2.7 and 3.5 (and higher). These are also the only P
 
 ## Installation
 
-There are currently two ways to use the modules in your setup: install from Ansible Galaxy or via RPM. RPM installation is planned for a future release.
+There are currently two ways to use the modules in your setup: install directly from Ansible Galaxy or via packages.
 
 ### Installation from Ansible Galaxy
 
@@ -35,11 +35,11 @@ You can install the collection from [Ansible Galaxy](https://galaxy.ansible.com/
 
 After the installation, the assets are available as `theforeman.operations.<name>`. Please see the [Using Ansible collections documentation](https://docs.ansible.com/ansible/devel/user_guide/collections_using.html) for further details.
 
-### Installation via RPM
+### Installation via packages
 
-The collection is planned to be available as `ansible-collection-theforeman-operations` from the `plugins` repository on `yum.theforeman.org` starting with a future Foreman release.
+The collection is also available as `ansible-collection-theforeman-operations` from the `plugins` repository on `yum.theforeman.org` for Enterprise Linux systems and from the `plugins` repository on `deb.theforeman.org` for Debian and Ubuntu systems.
 
-After installing the RPM, you can use the modules in the same way as when they are installed directly from Ansible Galaxy.
+After installing the package, you can use the modules in the same way as when they are installed directly from Ansible Galaxy.
 
 ## Dependencies
 

From 9c07488c3d65e0618350ef700502dd34e9941b7f Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Wed, 25 Jan 2023 19:35:29 +0100
Subject: [PATCH 03/18] document in the example that one needs the katello
 installer

---
 roles/installer/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/roles/installer/README.md b/roles/installer/README.md
index 2bf19e3..ab63164 100644
--- a/roles/installer/README.md
+++ b/roles/installer/README.md
@@ -31,6 +31,7 @@ Run the installer with the `katello` scenario, setting the initial organization
     - role: theforeman.operations.installer
       vars:
         foreman_installer_scenario: katello
+        foreman_installer_package: foreman-installer-katello
         foreman_installer_options:
           - '--foreman-initial-organization "ACME Inc"'
           - '--foreman-initial-admin-password changeme'

From f41d5195cca3a2e80d1824662d0b79ec3c89c1e6 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Wed, 22 Mar 2023 17:02:18 +0100
Subject: [PATCH 04/18] make lint happy

---
 roles/cloud_connector/tasks/http_proxy.yml  | 4 ++--
 roles/cloud_connector/tasks/main.yml        | 7 ++++---
 roles/foreman_repositories/tasks/redhat.yml | 2 ++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/roles/cloud_connector/tasks/http_proxy.yml b/roles/cloud_connector/tasks/http_proxy.yml
index 6754131..f5fd349 100644
--- a/roles/cloud_connector/tasks/http_proxy.yml
+++ b/roles/cloud_connector/tasks/http_proxy.yml
@@ -5,7 +5,7 @@
     path: /etc/systemd/system/rhcd.service.d
     owner: root
     group: root
-    mode: 0755
+    mode: '0755'
 
 - name: Deploy HTTP proxy systemd drop-in file
   ansible.builtin.template:
@@ -13,6 +13,6 @@
     dest: /etc/systemd/system/rhcd.service.d/proxy.conf
     owner: root
     group: root
-    mode: 0640
+    mode: '0640'
   notify:
     - Restart rhcd
diff --git a/roles/cloud_connector/tasks/main.yml b/roles/cloud_connector/tasks/main.yml
index 1c24747..cbe1f67 100644
--- a/roles/cloud_connector/tasks/main.yml
+++ b/roles/cloud_connector/tasks/main.yml
@@ -12,7 +12,7 @@
     path: "/etc/rhc/workers"
     owner: root
     group: root
-    mode: 0755
+    mode: '0755'
 
 - name: Configure rhc-cloud-connector-worker
   ansible.builtin.template:
@@ -20,7 +20,7 @@
     dest: "{{ foreman_cloud_connector_config_file }}"
     owner: root
     group: root
-    mode: 0640
+    mode: '0640'
 
 - name: Create rhcd worker
   ansible.builtin.copy:
@@ -31,7 +31,7 @@
       CONFIG_FILE="{{ foreman_cloud_connector_config_file }}" exec /usr/libexec/yggdrasil-worker-forwarder
     owner: root
     group: root
-    mode: 0755
+    mode: '0755'
 
 - name: Ensure rhcd started
   ansible.builtin.service:
@@ -42,6 +42,7 @@
 - name: Read client ID from CN of consumer
   ansible.builtin.command: openssl x509 -in /etc/pki/consumer/cert.pem -subject -noout
   register: cert_output
+  changed_when: false
   when: cert_output is not defined
 
 - name: Set client ID in Satellite
diff --git a/roles/foreman_repositories/tasks/redhat.yml b/roles/foreman_repositories/tasks/redhat.yml
index b81bca3..3d328ff 100644
--- a/roles/foreman_repositories/tasks/redhat.yml
+++ b/roles/foreman_repositories/tasks/redhat.yml
@@ -50,6 +50,8 @@
 
     - name: Enable powertools
       ansible.builtin.command: dnf config-manager --set-enabled powertools
+      register: dnf_set_enabled
+      changed_when: dnf_set_enabled.rc is defined and dnf_set_enabled.rc == '0'
       when:
         - "'powertools' in disabled_repos.stdout"
         - ansible_distribution != 'RedHat'

From b96e36e1b34d1ab1758c920b289e2a9269eaec27 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Wed, 22 Mar 2023 17:06:52 +0100
Subject: [PATCH 05/18] use older ansible-lint that still works with python 3.8
 on 3.8

---
 requirements-dev.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 23e24be..85fba39 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -7,4 +7,5 @@ pylint==2.6.0; python_version >= '3.6'
 voluptuous==0.12.1 # from https://github.com/ansible/ansible/raw/devel/test/lib/ansible_test/_data/requirements/sanity.validate-modules.txt
 yamllint
 molecule[docker,lint]
-ansible-lint
+ansible-lint; python_version >= '3.9'
+ansible-lint<6.12.0; python_version < '3.9'

From b8914fe6d02fb1f2b47ee81e8005cc009e4c6b64 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Thu, 23 Mar 2023 08:51:06 +0100
Subject: [PATCH 06/18] drop ansible_repositories role, it's not required
 anymore

---
 .../drop-ansible-repositories-role.yml        |  2 ++
 roles/ansible_repositories/README.md          | 22 -------------------
 .../molecule/redhat/collections.yml           |  5 -----
 .../molecule/redhat/converge.yml              |  6 -----
 .../molecule/redhat/molecule.yml              | 22 -------------------
 .../molecule/redhat/prepare.yml               |  6 -----
 .../molecule/redhat/verify.yml                |  9 --------
 roles/ansible_repositories/tasks/main.yml     |  3 ---
 roles/ansible_repositories/tasks/redhat.yml   | 10 ---------
 9 files changed, 2 insertions(+), 83 deletions(-)
 create mode 100644 changelogs/fragments/drop-ansible-repositories-role.yml
 delete mode 100644 roles/ansible_repositories/README.md
 delete mode 100644 roles/ansible_repositories/molecule/redhat/collections.yml
 delete mode 100644 roles/ansible_repositories/molecule/redhat/converge.yml
 delete mode 100644 roles/ansible_repositories/molecule/redhat/molecule.yml
 delete mode 100644 roles/ansible_repositories/molecule/redhat/prepare.yml
 delete mode 100644 roles/ansible_repositories/molecule/redhat/verify.yml
 delete mode 100644 roles/ansible_repositories/tasks/main.yml
 delete mode 100644 roles/ansible_repositories/tasks/redhat.yml

diff --git a/changelogs/fragments/drop-ansible-repositories-role.yml b/changelogs/fragments/drop-ansible-repositories-role.yml
new file mode 100644
index 0000000..95828bd
--- /dev/null
+++ b/changelogs/fragments/drop-ansible-repositories-role.yml
@@ -0,0 +1,2 @@
+breaking_changes:
+  - ansible_repositories role - removed as it's not required anymore since EL 8.6 contains ``ansible-core``
diff --git a/roles/ansible_repositories/README.md b/roles/ansible_repositories/README.md
deleted file mode 100644
index 75f0b85..0000000
--- a/roles/ansible_repositories/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-theforeman.operations.ansible_repositories
-=========================================
-
-Sets up Ansible repositories
-
-Role Variables
---------------
-
-None
-
-Example Playbooks
------------------
-
-Setup repositories for default Ansible 2.9 for use by installer:
-
-```yaml
----
-- hosts: all
-  gather_facts: true
-  roles:
-    - ansible_repositories
-```
diff --git a/roles/ansible_repositories/molecule/redhat/collections.yml b/roles/ansible_repositories/molecule/redhat/collections.yml
deleted file mode 100644
index 03425ca..0000000
--- a/roles/ansible_repositories/molecule/redhat/collections.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-collections:
-  - name: community.docker
-    version: ">=3,<4"
-  - name: community.general
-    version: ">=2,<3"
diff --git a/roles/ansible_repositories/molecule/redhat/converge.yml b/roles/ansible_repositories/molecule/redhat/converge.yml
deleted file mode 100644
index 0b356fa..0000000
--- a/roles/ansible_repositories/molecule/redhat/converge.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: Converge
-  hosts: all
-  gather_facts: true
-  roles:
-    - ansible_repositories
diff --git a/roles/ansible_repositories/molecule/redhat/molecule.yml b/roles/ansible_repositories/molecule/redhat/molecule.yml
deleted file mode 100644
index 1c22c75..0000000
--- a/roles/ansible_repositories/molecule/redhat/molecule.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-dependency:
-  name: galaxy
-driver:
-  name: ${DRIVER_NAME:-podman}
-platforms:
-  - name: centos8
-    image: quay.io/centos/centos:stream8
-    command: /sbin/init
-    tmpfs:
-      - /run
-      - /tmp:exec,mode=777
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-provisioner:
-  name: ansible
-verifier:
-  name: ansible
-lint: |
-  set -e
-  yamllint -c ../../.yamllint .
-  YAMLLINT_CONFIG_FILE=../../.yamllint ansible-lint .
diff --git a/roles/ansible_repositories/molecule/redhat/prepare.yml b/roles/ansible_repositories/molecule/redhat/prepare.yml
deleted file mode 100644
index 386bc75..0000000
--- a/roles/ansible_repositories/molecule/redhat/prepare.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: Prepare
-  hosts: all
-  gather_facts: true
-  roles:
-    - ansible_repositories
diff --git a/roles/ansible_repositories/molecule/redhat/verify.yml b/roles/ansible_repositories/molecule/redhat/verify.yml
deleted file mode 100644
index 81c4ae5..0000000
--- a/roles/ansible_repositories/molecule/redhat/verify.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Verify
-  hosts: all
-  gather_facts: false
-  tasks:
-    - name: Ensure centos-release-ansible-29 RPM is installed
-      ansible.builtin.package:
-        name: centos-release-ansible-29
-        state: present
diff --git a/roles/ansible_repositories/tasks/main.yml b/roles/ansible_repositories/tasks/main.yml
deleted file mode 100644
index 82a3fcc..0000000
--- a/roles/ansible_repositories/tasks/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-- name: 'Include {{ ansible_os_family }}'
-  ansible.builtin.include_tasks: '{{ ansible_os_family | lower }}.yml'
diff --git a/roles/ansible_repositories/tasks/redhat.yml b/roles/ansible_repositories/tasks/redhat.yml
deleted file mode 100644
index 0a47819..0000000
--- a/roles/ansible_repositories/tasks/redhat.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- name: 'Install centos-release-ansible29 on EL8'  # noqa package-latest
-  ansible.builtin.dnf:
-    name: centos-release-ansible-29
-    state: latest
-    update_cache: true
-  tags:
-    - packages
-  when:
-    - ansible_distribution_major_version == '8'

From 8170b7b6fe33a4396e9eb6fd31c2a1d840cbc6a8 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Wed, 22 Mar 2023 16:51:31 +0100
Subject: [PATCH 07/18] move module enablement to repositories role

---
 .../tasks/redhat-modules.yml                    | 11 +++++++++++
 roles/installer/tasks/main.yml                  | 17 -----------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/roles/foreman_repositories/tasks/redhat-modules.yml b/roles/foreman_repositories/tasks/redhat-modules.yml
index 26a750e..e615c63 100644
--- a/roles/foreman_repositories/tasks/redhat-modules.yml
+++ b/roles/foreman_repositories/tasks/redhat-modules.yml
@@ -1,4 +1,15 @@
 ---
+- name: Enable ruby:2.7 module
+  ansible.builtin.dnf:
+    name: '@ruby:2.7'
+    state: present
+  tags:
+    - packages
+  when:
+    - foreman_repositories_version != 'nightly'
+    - foreman_repositories_version is version('2.5', '>=')
+    - foreman_repositories_version is version('3.2', '<')
+
 - name: 'Enable foreman:el8 module'
   ansible.builtin.command: dnf module enable -y foreman:el8
   # can't use the `dnf` module for modules without a default stream
diff --git a/roles/installer/tasks/main.yml b/roles/installer/tasks/main.yml
index 6de4f16..d5b6aac 100644
--- a/roles/installer/tasks/main.yml
+++ b/roles/installer/tasks/main.yml
@@ -4,23 +4,6 @@
     that:
       - foreman_installer_scenario is defined
 
-- name: Enable the ruby module
-  when:
-    - ansible_distribution_major_version == '8'
-    - ansible_os_family == 'RedHat'
-  block:
-    - name: Get foreman-installer version
-      ansible.builtin.dnf:
-        list: foreman-installer
-      register: package_info
-
-    - name: Enable ruby:2.7 module
-      ansible.builtin.dnf:
-        name: '@ruby:2.7'
-        state: present
-      when:
-        - (package_info.results | map(attribute='version') | max) is version("2.5", ">=")
-
 # This is a workaround for https://projects.theforeman.org/issues/34468
 - name: "Install hostname"
   ansible.builtin.package:

From 87b03fa966b624471fdbef116db6079c8b4e69e3 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Thu, 23 Mar 2023 09:58:17 +0100
Subject: [PATCH 08/18] ensure EN locales are available when installing
 PostgreSQL

---
 roles/postgresql_upgrade/molecule/redhat/prepare.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/roles/postgresql_upgrade/molecule/redhat/prepare.yml b/roles/postgresql_upgrade/molecule/redhat/prepare.yml
index 3116854..8583683 100644
--- a/roles/postgresql_upgrade/molecule/redhat/prepare.yml
+++ b/roles/postgresql_upgrade/molecule/redhat/prepare.yml
@@ -3,6 +3,11 @@
   hosts: all
   gather_facts: true
   tasks:
+    - name: Ensure langpacks on EL8
+      ansible.builtin.dnf:
+        name: glibc-langpack-en
+        state: present
+
     - name: Install PostgreSQL 10
       ansible.builtin.dnf:
         name: '@postgresql:10/server'

From e12fd6294bf26cfa0aa928cde1b1cd805ecda2e8 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Thu, 23 Mar 2023 10:22:48 +0100
Subject: [PATCH 09/18] don't fail-fast molecule runs

---
 .github/workflows/main.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 95569ac..609a7bf 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -101,6 +101,7 @@ jobs:
   molecule:
     runs-on: ubuntu-20.04
     strategy:
+      fail-fast: false
       matrix:
         python:
           - "3.9"

From 0278611043597f94f295dc912ace149bc9c4e6d6 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Fri, 24 Mar 2023 13:14:57 +0100
Subject: [PATCH 10/18] wait for systemd to settle

--wait is only available in systemd v240+
(https://github.com/systemd/systemd/commit/adb6cd9be2b7e9e614d2b5835c7b70cf8eacc852)
but EL8 has v239
---
 .../molecule/default/prepare.yml                         | 9 +++++++++
 roles/installer/molecule/default/prepare.yml             | 9 +++++++++
 roles/postgresql_upgrade/molecule/redhat/prepare.yml     | 9 +++++++++
 3 files changed, 27 insertions(+)

diff --git a/roles/foreman_proxy_certs_generate/molecule/default/prepare.yml b/roles/foreman_proxy_certs_generate/molecule/default/prepare.yml
index ce05451..e06878d 100644
--- a/roles/foreman_proxy_certs_generate/molecule/default/prepare.yml
+++ b/roles/foreman_proxy_certs_generate/molecule/default/prepare.yml
@@ -10,6 +10,15 @@
     - foreman_repositories
     - puppet_repositories
   post_tasks:
+    - name: Wait for systemd
+      ansible.builtin.command: systemctl is-system-running --wait # noqa: command-instead-of-module
+      ignore_errors: true
+      changed_when: false
+      register: result
+      until: "'running' in result.stdout or 'degraded' in result.stdout"
+      retries: 12
+      delay: 10
+
     - name: Ensure langpacks on EL8
       ansible.builtin.dnf:
         name: glibc-langpack-en
diff --git a/roles/installer/molecule/default/prepare.yml b/roles/installer/molecule/default/prepare.yml
index c140285..d306857 100644
--- a/roles/installer/molecule/default/prepare.yml
+++ b/roles/installer/molecule/default/prepare.yml
@@ -7,6 +7,15 @@
     - puppet_repositories
     - foreman_repositories
   tasks:
+    - name: Wait for systemd
+      ansible.builtin.command: systemctl is-system-running --wait # noqa: command-instead-of-module
+      ignore_errors: true
+      changed_when: false
+      register: result
+      until: "'running' in result.stdout or 'degraded' in result.stdout"
+      retries: 12
+      delay: 10
+
     - name: Ensure langpacks on EL8
       ansible.builtin.dnf:
         name: glibc-langpack-en
diff --git a/roles/postgresql_upgrade/molecule/redhat/prepare.yml b/roles/postgresql_upgrade/molecule/redhat/prepare.yml
index 8583683..722a229 100644
--- a/roles/postgresql_upgrade/molecule/redhat/prepare.yml
+++ b/roles/postgresql_upgrade/molecule/redhat/prepare.yml
@@ -3,6 +3,15 @@
   hosts: all
   gather_facts: true
   tasks:
+    - name: Wait for systemd
+      ansible.builtin.command: systemctl is-system-running --wait # noqa: command-instead-of-module
+      ignore_errors: true
+      changed_when: false
+      register: result
+      until: "'running' in result.stdout or 'degraded' in result.stdout"
+      retries: 12
+      delay: 10
+
     - name: Ensure langpacks on EL8
       ansible.builtin.dnf:
         name: glibc-langpack-en

From 0a88aa032af46f552ce7b6470b57ad6ce27fdb4d Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Sat, 25 Mar 2023 09:57:14 +0100
Subject: [PATCH 11/18] set pipefail for psql | grep command

Fixes risky-shell-pipe ansible-lint rule
---
 roles/postgresql_upgrade/tasks/main.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/roles/postgresql_upgrade/tasks/main.yml b/roles/postgresql_upgrade/tasks/main.yml
index 726a462..982c09e 100644
--- a/roles/postgresql_upgrade/tasks/main.yml
+++ b/roles/postgresql_upgrade/tasks/main.yml
@@ -21,7 +21,9 @@
         state: started
 
     - name: Collect postgres data
-      ansible.builtin.shell: psql --list --tuples-only | grep -E "^\s+postgres"
+      ansible.builtin.shell: |
+        set -o pipefail
+        psql --list --tuples-only | grep -E "^\s+postgres"
       become: true
       become_user: postgres
       changed_when: false

From c247a117832f9d170c7055e2dd6dae6368be476b Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Tue, 18 Apr 2023 12:14:44 +0200
Subject: [PATCH 12/18] drop stray None from the backup readme

---
 roles/backup/README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/roles/backup/README.md b/roles/backup/README.md
index 1e73ef5..526c749 100644
--- a/roles/backup/README.md
+++ b/roles/backup/README.md
@@ -10,8 +10,6 @@ Role Variables
 * `foreman_backup_type`: Backup type, can be either `online` or `offline`, defaults to `online`
 * `foreman_backup_keep_full`: How many full (weekly) backups to keep, defaults to `2`
 
-None
-
 Example Playbooks
 -----------------
 

From 66bf9d99e74ba9bb49bdbd7678e007b3f5a0ff6b Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Tue, 4 Apr 2023 09:48:28 +0200
Subject: [PATCH 13/18] add stable-2.15 to test matrix

---
 .github/workflows/main.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 609a7bf..1774ae2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -20,6 +20,7 @@ jobs:
           - stable-2.12
           - stable-2.13
           - stable-2.14
+          - stable-2.15
           - devel
         include:
           - python: "3.8"
@@ -110,6 +111,7 @@ jobs:
           - stable-2.12
           - stable-2.13
           - stable-2.14
+          - stable-2.15
           - devel
         include:
           - python: "3.8"

From 206ca5cca66bd4e6c3f1503c1a66fbc3ffbc67fc Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Tue, 2 May 2023 09:11:48 +0200
Subject: [PATCH 14/18] use `molecule-plugins` when molecule 5+ is installed

the `docker` driver was moved to `molecule-plugins` in 5.x

molecule 5 is Python 3.9+, so by adding a Python version constraint we
can ensure this works as intended, without disturbing older Molecule and
Python versions that don't have `molecule-plugins` and thus would fail
to install those requirements.
---
 requirements-dev.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 85fba39..7fa9a6b 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -7,5 +7,6 @@ pylint==2.6.0; python_version >= '3.6'
 voluptuous==0.12.1 # from https://github.com/ansible/ansible/raw/devel/test/lib/ansible_test/_data/requirements/sanity.validate-modules.txt
 yamllint
 molecule[docker,lint]
+molecule-plugins[docker]; python_version >= '3.9'
 ansible-lint; python_version >= '3.9'
 ansible-lint<6.12.0; python_version < '3.9'

From f1f3c27988a4a85499b92128bff7b4960b74f250 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Tue, 2 May 2023 09:33:11 +0200
Subject: [PATCH 15/18] pin ansible-compat to < 4

https://github.com/ansible-community/molecule/issues/3903
---
 requirements-dev.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements-dev.txt b/requirements-dev.txt
index 7fa9a6b..7ff1d1e 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -8,5 +8,6 @@ voluptuous==0.12.1 # from https://github.com/ansible/ansible/raw/devel/test/lib/
 yamllint
 molecule[docker,lint]
 molecule-plugins[docker]; python_version >= '3.9'
+ansible-compat<4; python_version >= '3.6' # https://github.com/ansible-community/molecule/issues/3903
 ansible-lint; python_version >= '3.9'
 ansible-lint<6.12.0; python_version < '3.9'

From 82c42c821c47dcfdb8d8aed3db0e71d345632561 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Tue, 4 Apr 2023 07:58:39 +0200
Subject: [PATCH 16/18] don't mark proxy.conf systemd drop-in word-inaccessible

there is no benefit and systemd warns about this:

    systemd[1]: Configuration file /etc/systemd/system/rhcd.service.d/proxy.conf is marked world-inaccessible.
    This has no effect as configuration data is accessible via APIs without restrictions. Proceeding anyway.
---
 changelogs/fragments/bz2169682-world-inaccessible.yml | 2 ++
 roles/cloud_connector/tasks/http_proxy.yml            | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/fragments/bz2169682-world-inaccessible.yml

diff --git a/changelogs/fragments/bz2169682-world-inaccessible.yml b/changelogs/fragments/bz2169682-world-inaccessible.yml
new file mode 100644
index 0000000..4bf3d44
--- /dev/null
+++ b/changelogs/fragments/bz2169682-world-inaccessible.yml
@@ -0,0 +1,2 @@
+minor_changes:
+  - cloud_connector role - don't mark proxy.conf systemd drop-in word-inaccessible, there is no benefit and systemd warns about this (https://bugzilla.redhat.com/show_bug.cgi?id=2169682)
diff --git a/roles/cloud_connector/tasks/http_proxy.yml b/roles/cloud_connector/tasks/http_proxy.yml
index f5fd349..68a0ad7 100644
--- a/roles/cloud_connector/tasks/http_proxy.yml
+++ b/roles/cloud_connector/tasks/http_proxy.yml
@@ -13,6 +13,6 @@
     dest: /etc/systemd/system/rhcd.service.d/proxy.conf
     owner: root
     group: root
-    mode: '0640'
+    mode: '0644'
   notify:
     - Restart rhcd

From daeebe14cd0ee5e2277a4b09e7b06ac7e8a2d774 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Tue, 2 May 2023 09:05:07 +0200
Subject: [PATCH 17/18] Revert "wait for systemd to settle"

This reverts commit 0278611043597f94f295dc912ace149bc9c4e6d6.

This was needed for https://bugzilla.redhat.com/show_bug.cgi?id=2174645
which is now fixed in the latest CentOS Stream 8 container builds.
---
 .../molecule/default/prepare.yml                         | 9 ---------
 roles/installer/molecule/default/prepare.yml             | 9 ---------
 roles/postgresql_upgrade/molecule/redhat/prepare.yml     | 9 ---------
 3 files changed, 27 deletions(-)

diff --git a/roles/foreman_proxy_certs_generate/molecule/default/prepare.yml b/roles/foreman_proxy_certs_generate/molecule/default/prepare.yml
index e06878d..ce05451 100644
--- a/roles/foreman_proxy_certs_generate/molecule/default/prepare.yml
+++ b/roles/foreman_proxy_certs_generate/molecule/default/prepare.yml
@@ -10,15 +10,6 @@
     - foreman_repositories
     - puppet_repositories
   post_tasks:
-    - name: Wait for systemd
-      ansible.builtin.command: systemctl is-system-running --wait # noqa: command-instead-of-module
-      ignore_errors: true
-      changed_when: false
-      register: result
-      until: "'running' in result.stdout or 'degraded' in result.stdout"
-      retries: 12
-      delay: 10
-
     - name: Ensure langpacks on EL8
       ansible.builtin.dnf:
         name: glibc-langpack-en
diff --git a/roles/installer/molecule/default/prepare.yml b/roles/installer/molecule/default/prepare.yml
index d306857..c140285 100644
--- a/roles/installer/molecule/default/prepare.yml
+++ b/roles/installer/molecule/default/prepare.yml
@@ -7,15 +7,6 @@
     - puppet_repositories
     - foreman_repositories
   tasks:
-    - name: Wait for systemd
-      ansible.builtin.command: systemctl is-system-running --wait # noqa: command-instead-of-module
-      ignore_errors: true
-      changed_when: false
-      register: result
-      until: "'running' in result.stdout or 'degraded' in result.stdout"
-      retries: 12
-      delay: 10
-
     - name: Ensure langpacks on EL8
       ansible.builtin.dnf:
         name: glibc-langpack-en
diff --git a/roles/postgresql_upgrade/molecule/redhat/prepare.yml b/roles/postgresql_upgrade/molecule/redhat/prepare.yml
index 722a229..8583683 100644
--- a/roles/postgresql_upgrade/molecule/redhat/prepare.yml
+++ b/roles/postgresql_upgrade/molecule/redhat/prepare.yml
@@ -3,15 +3,6 @@
   hosts: all
   gather_facts: true
   tasks:
-    - name: Wait for systemd
-      ansible.builtin.command: systemctl is-system-running --wait # noqa: command-instead-of-module
-      ignore_errors: true
-      changed_when: false
-      register: result
-      until: "'running' in result.stdout or 'degraded' in result.stdout"
-      retries: 12
-      delay: 10
-
     - name: Ensure langpacks on EL8
       ansible.builtin.dnf:
         name: glibc-langpack-en

From d3f82d95e01c827c6418d758b00e8f6768c2d763 Mon Sep 17 00:00:00 2001
From: "Eric D. Helms" <ericdhelms@gmail.com>
Date: Mon, 8 May 2023 10:55:11 -0400
Subject: [PATCH 18/18] Release 2.0.0

---
 CHANGELOG.rst                                       | 13 +++++++++++++
 changelogs/changelog.yaml                           | 12 ++++++++++++
 .../fragments/bz2169682-world-inaccessible.yml      |  2 --
 .../fragments/drop-ansible-repositories-role.yml    |  2 --
 galaxy.yml                                          |  2 +-
 5 files changed, 26 insertions(+), 5 deletions(-)
 delete mode 100644 changelogs/fragments/bz2169682-world-inaccessible.yml
 delete mode 100644 changelogs/fragments/drop-ansible-repositories-role.yml

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 03e2e8e..c27467c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,19 @@ theforeman.operations Release Notes
 .. contents:: Topics
 
 
+v2.0.0
+======
+
+Minor Changes
+-------------
+
+- cloud_connector role - don't mark proxy.conf systemd drop-in word-inaccessible, there is no benefit and systemd warns about this (https://bugzilla.redhat.com/show_bug.cgi?id=2169682)
+
+Breaking Changes / Porting Guide
+--------------------------------
+
+- ansible_repositories role - removed as it's not required anymore since EL 8.6 contains ``ansible-core``
+
 v1.3.0
 ======
 
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
index 3b31dbe..d3b395e 100644
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -67,3 +67,15 @@ releases:
       - update default Foreman to 3.5
       - update default Puppet to 7
     release_date: '2023-01-04'
+  2.0.0:
+    changes:
+      breaking_changes:
+      - ansible_repositories role - removed as it's not required anymore since EL
+        8.6 contains ``ansible-core``
+      minor_changes:
+      - cloud_connector role - don't mark proxy.conf systemd drop-in word-inaccessible,
+        there is no benefit and systemd warns about this (https://bugzilla.redhat.com/show_bug.cgi?id=2169682)
+    fragments:
+    - bz2169682-world-inaccessible.yml
+    - drop-ansible-repositories-role.yml
+    release_date: '2023-05-08'
diff --git a/changelogs/fragments/bz2169682-world-inaccessible.yml b/changelogs/fragments/bz2169682-world-inaccessible.yml
deleted file mode 100644
index 4bf3d44..0000000
--- a/changelogs/fragments/bz2169682-world-inaccessible.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-minor_changes:
-  - cloud_connector role - don't mark proxy.conf systemd drop-in word-inaccessible, there is no benefit and systemd warns about this (https://bugzilla.redhat.com/show_bug.cgi?id=2169682)
diff --git a/changelogs/fragments/drop-ansible-repositories-role.yml b/changelogs/fragments/drop-ansible-repositories-role.yml
deleted file mode 100644
index 95828bd..0000000
--- a/changelogs/fragments/drop-ansible-repositories-role.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-breaking_changes:
-  - ansible_repositories role - removed as it's not required anymore since EL 8.6 contains ``ansible-core``
diff --git a/galaxy.yml b/galaxy.yml
index 21ada27..9b31cf3 100644
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -12,7 +12,7 @@ authors:
   - "Matthias Dellweg <2500@gmx.de>"
   - "Robert Rettig <robert@rettig.bayern>"
   - "willtome <willtome@gmail.com>"
-version: "1.4.0-dev"
+version: "2.0.0"
 license:
   - "GPL-3.0-or-later"
 tags: