Merge pull request #42 from RedHatSatellite/rel300

Release 3.0.0

.github/workflows/codeql-analysis.yml

@@ -22,12 +22,12 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/docs.yml

@@ -12,14 +12,14 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'RedHatSatellite/satellite-operations-collection'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: configure git
         run: |
           git config user.name "${GITHUB_ACTOR}"
           git config user.email "${GITHUB_ACTOR}@bots.github.com"
           git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/*
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
       - name: Install dependencies

.github/workflows/main.yml

@@ -18,24 +18,21 @@ jobs:
       fail-fast: false
       matrix:
         python:
-          - "3.10"
+          - "3.11"
         ansible:
-          - stable-2.12
-          - stable-2.13
           - stable-2.14
           - stable-2.15
+          - stable-2.16
           - devel
         include:
-          - python: "3.8"
-            ansible: "stable-2.12"
-          - python: "3.9"
-            ansible: "stable-2.13"
-          - python: "3.11"
+          - python: "3.10"
+            ansible: "stable-2.14"
+          - python: "3.12"
             ansible: "devel"
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
           cache: 'pip'
@@ -52,9 +49,9 @@ jobs:
   docs:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
           cache: 'pip'
@@ -64,17 +61,17 @@ jobs:
       - name: Build docs
         run: make doc
       - name: Upload docs artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docs-html
           path: docs/_build/html/
 
   galaxy-importer:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
           cache: 'pip'
@@ -87,9 +84,9 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
           cache: 'pip'
@@ -103,7 +100,7 @@ jobs:
       - name: Run lint
         run: make lint
       - name: Upload collection artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: collection
           path: redhat-satellite_operations-*.tar.gz
@@ -114,33 +111,21 @@ jobs:
       fail-fast: false
       matrix:
         python:
-          - "3.10"
+          - "3.11"
         ansible:
-          - stable-2.12
-          - stable-2.13
           - stable-2.14
           - stable-2.15
-          - devel
-        include:
-          - python: "3.8"
-            ansible: "stable-2.9"
-          - python: "3.8"
-            ansible: "stable-2.10"
-          - python: "3.9"
-            ansible: "stable-2.11"
+          - stable-2.16
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python }}
       - name: Install Ansible
         run: pip install --upgrade https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz
       - name: Install dependencies
         run: make test-setup
-      - name: Install Ansible 2.9 compatible molecule
-        run: pip install --upgrade 'molecule[docker,lint]<4.0'
-        if: matrix.ansible == 'stable-2.9'
       - name: Run tests
         env:
           DRIVER_NAME: docker
@@ -149,9 +134,9 @@ jobs:
   execution_environment:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
           cache: 'pip'

.github/workflows/release.yml

@@ -10,14 +10,16 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'RedHatSatellite/satellite-operations-collection'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: "3.11"
       - name: Install Ansible
         run: pip install --upgrade ansible
       - name: Build Ansible Collection
         run: make dist
-      - name: Deploy Ansible Collection
-        run: make publish GALAXY_API_KEY=${{ secrets.GALAXY_API_KEY }}
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: redhat-satellite_operations-*.tar.gz

CHANGELOG.rst

@@ -4,6 +4,15 @@ redhat.satellite_operations Release Notes
 
 .. contents:: Topics
 
+v3.0.0
+======
+
+Minor Changes
+-------------
+
+- cloud_connector role - Remove receptor cleanup steps in configure cloud connector
+- cloud_connector role - Restart rhcd after writing out config file
+- metrics role - new role to setup PCP integration with Foreman 3.9 and newer
 
 v2.1.0
 ======

changelogs/changelog.yaml

@@ -75,3 +75,17 @@ releases:
     release_date: '2023-05-08'
   2.1.0:
     release_date: '2023-09-01'
+  3.0.0:
+    changes:
+      minor_changes:
+      - cloud_connector role - Remove receptor cleanup steps in configure cloud connector
+      - cloud_connector role - Restart rhcd after writing out config file
+      - metrics role - new role to setup PCP integration with Foreman 3.9 and newer
+    fragments:
+    - add-metrics-role.yml
+    - drop-default-repo.yml
+    - drop-el7.yml
+    - drop-foreman-pre-3.2.yml
+    - drop-postgresql_upgrade-role.yml
+    - pulpcore-module-only-up-to-410.yml
+    release_date: '2024-04-08'

galaxy.yml

@@ -3,16 +3,18 @@ name: "satellite_operations"
 description: Satellite operations tasks such as install, upgrade and maintenance
 authors:
   - "Baptiste Agasse <[email protected]>"
+  - "Chris Roberts <[email protected]>"
   - "Eric D. Helms <[email protected]>"
   - "Evgeni Golov <[email protected]>"
   - "Ewoud Kohl van Wijngaarden <[email protected]>"
+  - "Griffin Sullivan <[email protected]>"
   - "Jeffrey van Pelt <[email protected]>"
   - "Jeremy Audet <[email protected]>"
   - "Kyle Williams <[email protected]>"
   - "Matthias Dellweg <[email protected]>"
   - "Robert Rettig <[email protected]>"
   - "willtome <[email protected]>"
-version: "2.1.0"
+version: "3.0.0"
 license:
   - "GPL-3.0-or-later"
 tags:

meta/runtime.yml

@@ -1,2 +1,2 @@
 ---
-requires_ansible: '>=2.9'
+requires_ansible: '>=2.14.0'

roles/backup/molecule/satellite/prepare.yml

@@ -2,9 +2,7 @@
 - name: Prepare
   hosts: all
   gather_facts: true
-  pre_tasks:
+  tasks:
     - name: Install crontabs
       ansible.builtin.package:
         name: crontabs
-  roles:
-    - backup

roles/capsule_certs_generate/molecule/satellite/prepare.yml

@@ -3,14 +3,19 @@
   hosts: all
   gather_facts: true
   become: true
-  roles:
-    - role: theforeman.operations.foreman_repositories
+  tasks:
+    - name: Configure Puppet repositories
+      ansible.builtin.include_role:
+        name: theforeman.operations.puppet_repositories
+    - name: Configure Foreman repositories  # noqa: var-naming[pattern]
+      ansible.builtin.include_role:
+        name: theforeman.operations.foreman_repositories
       vars:
-        foreman_repositories_version: "3.1"
-        foreman_repositories_katello_version: "4.3"
-    - theforeman.operations.puppet_repositories
-    - fake_installer_rpm
-  post_tasks:
+        foreman_repositories_version: "3.8"
+        foreman_repositories_katello_version: "4.10"
+    - name: Setup fake installer
+      ansible.builtin.include_role:
+        name: fake_installer_rpm
     - name: Ensure langpacks on EL8
       ansible.builtin.dnf:
         name: glibc-langpack-en
@@ -22,5 +27,4 @@
       vars:
         satellite_installer_scenario: satellite
         satellite_installer_options:
-          - '--disable-system-checks'
-          - '--verbose-log-level debug'
+          - '--tuning development'

roles/cloud_connector/tasks/main.yml

@@ -21,6 +21,8 @@
     owner: root
     group: root
     mode: '0640'
+  notify:
+    - Restart rhcd
 
 - name: Create rhcd worker
   ansible.builtin.copy:
@@ -63,6 +65,3 @@
 - name: Configure HTTP proxy
   ansible.builtin.include_tasks: http_proxy.yml
   when: satellite_cloud_connector_http_proxy is defined
-
-- name: Cleanup receptor
-  ansible.builtin.include_tasks: cleanup_receptor.yml

roles/fake_installer_rpm/molecule/satellite/prepare.yml

@@ -7,5 +7,5 @@
     - theforeman.operations.puppet_repositories
     - role: theforeman.operations.foreman_repositories
       vars:
-        foreman_repositories_version: "2.4"
-        foreman_repositories_katello_version: "4.0"
+        foreman_repositories_version: "3.2"  # noqa: var-naming[pattern]
+        foreman_repositories_katello_version: "4.4"  # noqa: var-naming[pattern]

roles/installer/molecule/satellite/prepare.yml

@@ -3,14 +3,19 @@
   hosts: all
   gather_facts: true
   become: true
-  roles:
-    - theforeman.operations.puppet_repositories
-    - role: theforeman.operations.foreman_repositories
+  tasks:
+    - name: Configure Puppet repositories
+      ansible.builtin.include_role:
+        name: theforeman.operations.puppet_repositories
+    - name: Configure Foreman repositories  # noqa: var-naming[pattern]
+      ansible.builtin.include_role:
+        name: theforeman.operations.foreman_repositories
       vars:
         foreman_repositories_version: "3.2"
         foreman_repositories_katello_version: "4.4"
-    - fake_installer_rpm
-  tasks:
+    - name: Setup fake installer
+      ansible.builtin.include_role:
+        name: fake_installer_rpm
     - name: Ensure langpacks on EL8
       ansible.builtin.dnf:
         name: glibc-langpack-en