diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f6a8e88..aa44494 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" @@ -103,6 +104,7 @@ jobs: molecule: runs-on: ubuntu-20.04 strategy: + fail-fast: false matrix: python: - "3.9" @@ -111,6 +113,7 @@ jobs: - stable-2.12 - stable-2.13 - stable-2.14 + - stable-2.15 - devel include: - python: "3.8" diff --git a/CHANGELOG.rst b/CHANGELOG.rst index af89880..4e63c59 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,14 @@ redhat.satellite_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) + v1.3.0 ====== diff --git a/Makefile b/Makefile index 939b703..275634f 100644 --- a/Makefile +++ b/Makefile @@ -98,6 +98,7 @@ doc: $(MANIFEST) branding: sed -i 's/theforeman\.operations/redhat.satellite_operations/g' changelogs/config.yaml changelogs/changelog.yaml CHANGELOG.rst roles/*/README.md roles/*/*/*.yml sed -i 's/foreman.example.com/satellite.example.com/g' roles/*/README.md roles/*/*/*.yml + sed -i 's/katello/satellite/g' roles/*/README.md roles/*/*/*.yml sed -i 's#theforeman/foreman-operations-collection#RedHatSatellite/satellite-operations-collection#g' .github/workflows/*.yml sed -i 's/theforeman-foreman/redhat-satellite-operations/g' .github/workflows/*.yml sed -i 's/Foreman Operations Collection/Red Hat Satellite Operations Collection/g' docs/index.rst docs/conf.py diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml index 6df60fd..47dff51 100644 --- a/changelogs/changelog.yaml +++ b/changelogs/changelog.yaml @@ -65,3 +65,11 @@ releases: minor_changes: - new role to configure backups using ``foreman-maintain`` release_date: '2023-01-04' + 2.0.0: + changes: + 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 + release_date: '2023-05-08' diff --git a/galaxy.yml b/galaxy.yml index caa03cd..81b3f9a 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -12,7 +12,7 @@ authors: - "Matthias Dellweg <2500@gmx.de>" - "Robert Rettig " - "willtome " -version: "1.3.0" +version: "2.0.0" license: - "GPL-3.0-or-later" tags: diff --git a/requirements-dev.txt b/requirements-dev.txt index 23e24be..7ff1d1e 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -7,4 +7,7 @@ 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 +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' diff --git a/roles/backup/README.md b/roles/backup/README.md index af148bd..4dd6cde 100644 --- a/roles/backup/README.md +++ b/roles/backup/README.md @@ -10,8 +10,6 @@ Role Variables * `satellite_backup_type`: Backup type, can be either `online` or `offline`, defaults to `online` * `satellite_backup_keep_full`: How many full (weekly) backups to keep, defaults to `2` -None - Example Playbooks ----------------- diff --git a/roles/cloud_connector/tasks/http_proxy.yml b/roles/cloud_connector/tasks/http_proxy.yml index 6754131..68a0ad7 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: '0644' notify: - Restart rhcd diff --git a/roles/cloud_connector/tasks/main.yml b/roles/cloud_connector/tasks/main.yml index d037932..27dd907 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: "{{ satellite_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="{{ satellite_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/installer/README.md b/roles/installer/README.md index c0286b2..ddc25cf 100644 --- a/roles/installer/README.md +++ b/roles/installer/README.md @@ -31,6 +31,7 @@ Run the installer with the `satellite` scenario, setting the initial organizatio - role: redhat.satellite_operations.installer vars: satellite_installer_scenario: satellite + satellite_installer_package: satellite-installer satellite_installer_options: - '--foreman-initial-organization "ACME Inc"' - '--foreman-initial-admin-password changeme' diff --git a/roles/installer/tasks/main.yml b/roles/installer/tasks/main.yml index 38eba60..3a72deb 100644 --- a/roles/installer/tasks/main.yml +++ b/roles/installer/tasks/main.yml @@ -4,23 +4,6 @@ that: - satellite_installer_scenario is defined -- name: Enable the ruby module - when: - - ansible_distribution_major_version == '8' - - ansible_os_family == 'RedHat' - block: - - name: Get satellite-installer version - ansible.builtin.dnf: - list: satellite-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: