Merge pull request #36 from RedHatSatellite/rel210

Release 2.1.0

.ansible-lint

@@ -1,3 +1,6 @@
 ---
 enable_list:
   - only-builtins
+skip_list:
+  - var-naming[no-role-prefix]
+var_naming_pattern: "^(__)?satellite_[a-z_][a-z0-9_]*$"

.github/workflows/docs.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
       - name: Install dependencies
         run: make doc-setup
       - name: Build docs

.github/workflows/main.yml

@@ -1,6 +1,10 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: '0 6 * * *'
 
 env:
   COLORTERM: 'yes'
@@ -14,29 +18,18 @@ jobs:
       fail-fast: false
       matrix:
         python:
-          - "3.9"
+          - "3.10"
         ansible:
-          - stable-2.11
           - 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: "2.7"
-            ansible: "stable-2.11"
-          - python: "3.5"
-            ansible: "stable-2.11"
-          - python: "3.6"
-            ansible: "stable-2.11"
-          - python: "3.7"
-            ansible: "stable-2.11"
-          - python: "3.10"
-            ansible: "devel"
+            ansible: "stable-2.12"
+          - python: "3.9"
+            ansible: "stable-2.13"
           - python: "3.11"
             ansible: "devel"
     steps:
@@ -55,7 +48,6 @@ jobs:
         run: make test-setup
       - name: Run sanity tests
         run: make SANITY_OPTS="--local" sanity
-        if: matrix.ansible != 'stable-2.9' && matrix.ansible != 'stable-2.10' && matrix.ansible != 'stable-2.11'
 
   docs:
     runs-on: ubuntu-latest
@@ -64,7 +56,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
           cache: 'pip'
           cache-dependency-path: '**/requirements*.txt'
       - name: Install dependencies
@@ -77,14 +69,29 @@ jobs:
           name: docs-html
           path: docs/_build/html/
 
+  galaxy-importer:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.11"
+          cache: 'pip'
+          cache-dependency-path: '**/requirements*.txt'
+      - name: Install dependencies
+        run: pip install --upgrade py galaxy-importer
+      - name: Run galaxy-importer
+        run: make galaxy-importer
+
   lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
           cache: 'pip'
           cache-dependency-path: '**/requirements*.txt'
       - name: Install dependencies
@@ -99,17 +106,16 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: collection
-          path: theforeman-operations-*.tar.gz
+          path: redhat-satellite_operations-*.tar.gz
 
   molecule:
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
         python:
-          - "3.9"
+          - "3.10"
         ansible:
-          - stable-2.11
           - stable-2.12
           - stable-2.13
           - stable-2.14
@@ -120,6 +126,8 @@ jobs:
             ansible: "stable-2.9"
           - python: "3.8"
             ansible: "stable-2.10"
+          - python: "3.9"
+            ansible: "stable-2.11"
     steps:
       - uses: actions/checkout@v3
       - name: Set up Python
@@ -145,7 +153,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
           cache: 'pip'
           cache-dependency-path: '**/requirements*.txt'
       - name: Install dependencies

.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.11"
       - name: Install Ansible
         run: pip install --upgrade ansible
       - name: Build Ansible Collection

CHANGELOG.rst

@@ -5,6 +5,9 @@ redhat.satellite_operations Release Notes
 .. contents:: Topics
 
 
+v2.1.0
+======
+
 v2.0.0
 ======
 

Makefile

@@ -43,6 +43,9 @@ info:
 
 lint: $(MANIFEST)
 	yamllint -f parsable roles
+	ansible-lint -v roles/*
+
+galaxy-importer: $(MANIFEST)
 	GALAXY_IMPORTER_CONFIG=tests/galaxy-importer.cfg python -m galaxy_importer.main $(NAMESPACE)-$(NAME)-$(VERSION).tar.gz
 
 sanity: $(MANIFEST)
@@ -100,7 +103,7 @@ branding:
 	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/theforeman-operations/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
 	sed -i 's/The Foreman Project/Red Hat, Inc./g' docs/conf.py
 	sed -i 's/Foreman/Satellite/g' roles/*/README.md roles/*/*/*.yml
@@ -109,6 +112,7 @@ branding:
 	sed -i '/foreman_\w/ s/foreman_/satellite_/g' roles/*/README.md roles/*/*/*.yml roles/*/*/*.j2
 	sed -i 's/satellite_rh_cloud/foreman_rh_cloud/g' roles/*/README.md roles/*/*/*.yml roles/*/*/*.j2
 	sed -i 's/foreman-installer/satellite-installer/g' roles/*/README.md roles/*/*/*.yml
+	sed -i 's/foreman/satellite/' .ansible-lint
 	rm -rf roles/puppet_repositories roles/foreman_repositories roles/postgresql_upgrade roles/ansible_repositories
 	[ ! -d roles/foreman_proxy_certs_generate ] || mv roles/foreman_proxy_certs_generate roles/capsule_certs_generate
 	rm -rf roles/*/molecule/default roles/*/molecule/debian roles/*/molecule/redhat

changelogs/changelog.yaml

@@ -73,3 +73,5 @@ releases:
     fragments:
     - bz2169682-world-inaccessible.yml
     release_date: '2023-05-08'
+  2.1.0:
+    release_date: '2023-09-01'

galaxy.yml

@@ -12,7 +12,7 @@ authors:
   - "Matthias Dellweg <[email protected]>"
   - "Robert Rettig <[email protected]>"
   - "willtome <[email protected]>"
-version: "2.0.0"
+version: "2.1.0"
 license:
   - "GPL-3.0-or-later"
 tags:

requirements-lint.txt

@@ -1,4 +1,3 @@
 flake8<4
 yamllint
 ansible-lint>=6.1.0
-galaxy-importer

roles/backup/molecule/satellite/verify.yml

@@ -6,11 +6,11 @@
     - name: Get cronjob file
       ansible.builtin.slurp:
         path: /etc/cron.daily/foreman-backup
-      register: backupcron
+      register: __satellite_backupcron
 
     - name: Check foreman cronjob content
       ansible.builtin.assert:
         that:
-          - "'/var/backup/foreman' in crobjobcontent"
+          - "'/var/backup/foreman' in __satellite_crobjobcontent"
       vars:
-        crobjobcontent: "{{ backupcron['content'] | b64decode }}"
+        __satellite_crobjobcontent: "{{ __satellite_backupcron['content'] | b64decode }}"

roles/capsule_certs_generate/molecule/satellite/prepare.yml

@@ -3,11 +3,11 @@
   hosts: all
   gather_facts: true
   become: true
-  vars:
-    foreman_repositories_version: "3.1"
-    foreman_repositories_katello_version: "4.3"
   roles:
-    - theforeman.operations.foreman_repositories
+    - role: 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:

roles/capsule_certs_generate/molecule/satellite/verify.yml

@@ -6,9 +6,9 @@
     - name: Find proxy certs file
       ansible.builtin.stat:
         path: /root/proxy.example.com.tar.gz
-      register: cert_tarball
+      register: __satellite_cert_tarball
 
     - name: Check proxy certs file exists
       ansible.builtin.assert:
         that:
-          - cert_tarball.stat.exists
+          - __satellite_cert_tarball.stat.exists

roles/cloud_connector/tasks/cleanup_receptor.yml

@@ -13,11 +13,11 @@
   ansible.builtin.find:
     paths: /etc/receptor
     file_type: directory
-  register: receptor_configs
+  register: __satellite_receptor_configs
 
 - name: Delete sources
   ansible.builtin.include_tasks: delete_source.yml
-  loop: "{{ receptor_configs['files'] }}"
+  loop: "{{ __satellite_receptor_configs['files'] }}"
 
 - name: Collect service facts
   ansible.builtin.service_facts:

roles/cloud_connector/tasks/delete_source.yml

@@ -5,14 +5,14 @@
     client_cert: "{{ item.path }}/cert.pem"
     client_key: "{{ item.path }}/key.pem"
     return_content: true
-  register: source_record_response
+  register: __satellite_source_record_response
 
 - name: Delete Source
   vars:
-    source_id: "{{ source_record_response.json.data[0].id }}"
-  when: "source_record_response.json.data | length == 1"
+    __satellite_source_id: "{{ __satellite_source_record_response.json.data[0].id }}"
+  when: "__satellite_source_record_response.json.data | length == 1"
   ansible.builtin.uri:
-    url: "https://{{ satellite_cloud_connector_console_redhat_host }}/api/sources/v3.1/sources/{{ source_id }}"
+    url: "https://{{ satellite_cloud_connector_console_redhat_host }}/api/sources/v3.1/sources/{{ __satellite_source_id }}"
     client_cert: "{{ item.path }}/cert.pem"
     client_key: "{{ item.path }}/key.pem"
     method: "DELETE"

roles/cloud_connector/tasks/main.yml

@@ -41,9 +41,9 @@
 
 - name: Read client ID from CN of consumer
   ansible.builtin.command: openssl x509 -in /etc/pki/consumer/cert.pem -subject -noout
-  register: cert_output
+  register: __satellite_cert_output
   changed_when: false
-  when: cert_output is not defined
+  when: __satellite_cert_output is not defined
 
 - name: Set client ID in Satellite
   ansible.builtin.uri:
@@ -52,13 +52,13 @@
     password: "{{ satellite_cloud_connector_password }}"
     body:
       setting:
-        value: "{{ client_id }}"
+        value: "{{ __satellite_client_id }}"
     method: "PUT"
     validate_certs: "{{ satellite_cloud_connector_validate_certs }}"
     force_basic_auth: true
     body_format: json
   vars:
-    client_id: "{{ cert_output.stdout | regex_search('CN\\s?=\\s?([a-z0-9-]+)', '\\1') | first }}"
+    __satellite_client_id: "{{ __satellite_cert_output.stdout | regex_search('CN\\s?=\\s?([a-z0-9-]+)', '\\1') | first }}"
 
 - name: Configure HTTP proxy
   ansible.builtin.include_tasks: http_proxy.yml

roles/fake_installer_rpm/defaults/main.yml

@@ -1,2 +1,2 @@
 ---
-fake_installer_rpm_repo: "/tmp/fake-installer-repo"
+satellite_fake_installer_rpm_repo: "/tmp/fake-installer-repo"

roles/fake_installer_rpm/molecule/satellite/prepare.yml

@@ -3,9 +3,9 @@
   hosts: all
   gather_facts: true
   become: true
-  vars:
-    foreman_repositories_version: "2.4"
-    foreman_repositories_katello_version: "4.0"
   roles:
     - theforeman.operations.puppet_repositories
-    - theforeman.operations.foreman_repositories
+    - role: theforeman.operations.foreman_repositories
+      vars:
+        foreman_repositories_version: "2.4"
+        foreman_repositories_katello_version: "4.0"

roles/fake_installer_rpm/molecule/satellite/verify.yml

@@ -3,18 +3,18 @@
   hosts: all
   gather_facts: false
   tasks:
-    - name: satellite-installer RPM can be installed
-      package:
+    - name: Install satellite-installer RPM
+      ansible.builtin.package:
         name: satellite-installer
         state: present
 
-    - name: find satellite-installer symlink
-      stat:
+    - name: Find satellite-installer symlink
+      ansible.builtin.stat:
         path: /usr/sbin/satellite-installer
       register: satellite_installer
 
-    - name: check satellite-installer symlink exists
-      assert:
+    - name: Check satellite-installer symlink exists
+      ansible.builtin.assert:
         that:
           - satellite_installer.stat.exists
           - satellite_installer.stat.islnk