Merge pull request #26 from RedHatSatellite/rel210

release 2.1.0
RedHatSatellite · May 20, 2021 · 998fd25 · 998fd25
2 parents 8ce5e00 + ac3ba24
commit 998fd25
Show file tree

Hide file tree

Showing 120 changed files with 14,100 additions and 840 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -23,15 +23,6 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v1

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,6 +23,7 @@ jobs:
           - stable-2.8
           - stable-2.9
           - stable-2.10
+          - stable-2.11
           - devel
         exclude:
           - python: "2.7"
@@ -31,32 +32,40 @@ jobs:
             ansible: "stable-2.9"
           - python: "2.7"
             ansible: "stable-2.10"
+          - python: "2.7"
+            ansible: "stable-2.11"
           - python: "3.6"
             ansible: "stable-2.8"
           - python: "3.6"
             ansible: "stable-2.9"
           - python: "3.6"
             ansible: "stable-2.10"
+          - python: "3.6"
+            ansible: "stable-2.11"
           - python: "3.8"
             ansible: "stable-2.8"
           - python: "3.8"
             ansible: "stable-2.9"
           - python: "3.8"
             ansible: "stable-2.10"
+          - python: "3.8"
+            ansible: "stable-2.11"
           - python: "3.9"
             ansible: "stable-2.8"
           - python: "3.9"
             ansible: "stable-2.9"
           - python: "3.9"
             ansible: "stable-2.10"
+          - python: "3.9"
+            ansible: "stable-2.11"
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python }}
       - name: Restore pip cache
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements*.txt') }}
@@ -77,7 +86,7 @@ jobs:
         run: sudo mkdir -p /etc/rhsm/ca/ && sudo touch /etc/rhsm/ca/redhat-uep.pem
       - name: Install required collections for ansible-base (2.10+)
         run: ansible-galaxy collection install community.docker
-        if: matrix.ansible == 'devel' || matrix.ansible == 'stable-2.10'
+        if: matrix.ansible == 'devel' || matrix.ansible == 'stable-2.10' || matrix.ansible == 'stable-2.11'
       - name: Run crud tests
         run: make test-crud
       - name: Run other tests
@@ -86,7 +95,7 @@ jobs:
         run: make dist-test
       - name: Run sanity tests
         run: make SANITY_OPTS="--local" sanity
-        if: matrix.ansible == 'devel' || matrix.ansible == 'stable-2.10'
+        if: matrix.ansible == 'devel' || matrix.ansible == 'stable-2.10' || matrix.stable == 'stable-2.11'
 
   checkmode:
     runs-on: ubuntu-latest
@@ -97,7 +106,7 @@ jobs:
         with:
           python-version: "3.7"
       - name: Restore pip cache
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements*.txt') }}
@@ -119,7 +128,7 @@ jobs:
         with:
           python-version: "3.7"
       - name: Restore pip cache
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements*.txt') }}
@@ -144,7 +153,7 @@ jobs:
         with:
           python-version: "3.7"
       - name: Restore pip cache
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements*.txt') }}

diff --git a/.mailmap b/.mailmap
@@ -14,3 +14,5 @@ Paul Gration <[email protected]>
 Peter Ondrejka <[email protected]> <[email protected]>
 Richard Stempfl <[email protected]> <[email protected]>
 Richard Stempfl <[email protected]> <[email protected]>
+Adam Růžička <[email protected]>
+Adam Růžička <[email protected]> <[email protected]>
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,43 @@ redhat.satellite Release Notes
 
 This changelog describes changes after version 0.8.1.
 
+v2.1.0
+======
+
+Minor Changes
+-------------
+
+- Add a domain_info module
+- Add a hostgroups role (https://github.com/theforeman/foreman-ansible-modules/issues/1116)
+- Add a role `content_rhel` to perform basic setup for registering and syncing RHEL content hosts
+- Add content credentials role
+- callback plugin - collect facts during the run, merge them correctly and upload them once at the end
+- compute_resource - add ``cloud`` param for the AzureRm provider, to select which Azure cloud to use
+- compute_resource - add ``sub_id`` parameter for handling the Azure Subscription ID instead of the ``user`` parameter
+- host - Add ``Redfish`` to list of possible BMC providers of an interface
+- host, compute_profile - look up the correct id for storage pods and domains given as part of ``volumes_attributes`` (https://bugzilla.redhat.com/show_bug.cgi?id=1885234)
+- hostgroup - add a ``ansible_roles`` parameter (https://github.com/theforeman/foreman-ansible-modules/issues/1123)
+- new ``content_views`` role to manage content views (https://github.com/theforeman/foreman-ansible-modules/issues/1111)
+- new ``organizations`` role to manage organizations (https://github.com/theforeman/foreman-ansible-modules/issues/1109)
+- subnet - add ``bmc_proxy`` parameter to configure BMC proxies for subnets
+
+Bugfixes
+--------
+
+- host - pass the right image id to the compute resource when creating a host (https://github.com/theforeman/foreman-ansible-modules/issues/1160, https://bugzilla.redhat.com/show_bug.cgi?id=1911670)
+
+New Modules
+-----------
+
+- redhat.satellite.content_view_info - Fetch information about Content Views
+- redhat.satellite.content_view_version_info - Fetch information about Content Views
+- redhat.satellite.domain_info - Fetch information about Domains
+- redhat.satellite.host_errata_info - Fetch information about Host Errata
+- redhat.satellite.repository_set_info - Fetch information about Red Hat Repositories
+- redhat.satellite.setting_info - Fetch information about Settings
+- redhat.satellite.subnet_info - Fetch information about Subnets
+- redhat.satellite.subscription_info - Fetch information about Subscriptions
+
 v2.0.1
 ======
 

diff --git a/Makefile b/Makefile
@@ -5,7 +5,7 @@ MANIFEST := build/collections/ansible_collections/$(NAMESPACE)/$(NAME)/MANIFEST.
 
 ROLES := $(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 bindep.txt
 $(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),$(wildcard $(ROLE)/*/*)) $(foreach ROLE,$(ROLES),$(ROLE)/README.md)
 
@@ -138,15 +138,15 @@ vendor:
 	python vendor.py build/apypie-git/apypie/*.py > plugins/module_utils/_apypie.py
 
 branding:
-	sed -i 's/theforeman\.foreman/redhat.satellite/g' plugins/*/*.py tests/inventory/*.foreman.yml tests/test_module_state.py tests/test_playbooks/*.yml changelogs/config.yaml changelogs/changelog.yaml CHANGELOG.rst roles/*/README.md roles/*/*/*.yml docs/cvmanager.md
+	sed -i 's/theforeman\.foreman/redhat.satellite/g' plugins/*/*.py tests/inventory/*.foreman.yml tests/test_module_state.py tests/test_playbooks/*.yml changelogs/config.yaml changelogs/changelog.yaml CHANGELOG.rst roles/*/README.md roles/*/*/*.yml docs/cvmanager.md tests/test_playbooks/fixtures/*.yml
 	sed -i 's/foreman.example.com/satellite.example.com/g' plugins/*/*.py docs/cvmanager.md roles/*/README.md roles/*/*/*.yml
 	sed -i 's#theforeman/foreman-ansible-modules#RedHatSatellite/satellite-ansible-collection#g' .github/workflows/*.yml
 	sed -i 's/theforeman-foreman/redhat-satellite/g' .github/workflows/*.yml
 	sed -i 's/Foreman Ansible Modules/Red Hat Satellite Ansible Collection/g' docs/index.rst docs/conf.py docs/cvmanager.md
 	sed -i 's/The Foreman Project/Red Hat, Inc./g' docs/conf.py
 	sed -i '/FOREMAN_\w/ s/FOREMAN_/SATELLITE_/g' plugins/doc_fragments/foreman.py plugins/module_utils/foreman_helper.py Makefile
 	sed -i '/foreman_\w/ s/foreman_/satellite_/g' roles/*/README.md roles/*/*/*.yml
-	sed -i '/foreman_\w.*:/ s/foreman_/satellite_/g' tests/test_playbooks/*_role.yml
+	sed -i '/foreman_\w.*:/ s/foreman_/satellite_/g' tests/test_playbooks/*_role.yml docs/cvmanager.md
 	rm -rf tests/test_playbooks/scc_* tests/test_playbooks/tasks/scc_* tests/test_playbooks/fixtures/scc_* plugins/modules/scc_*.py tests/fixtures/apidoc/scc_*.json
 	rm -rf tests/test_playbooks/snapshot* tests/test_playbooks/tasks/snapshot* tests/test_playbooks/fixtures/snapshot* plugins/modules/snapshot.py tests/fixtures/apidoc/snapshot.json
 

diff --git a/bindep.txt b/bindep.txt
@@ -0,0 +1,2 @@
+python3-rpm [(platform:redhat platform:base-py3)]
+rpm-python [(platform:redhat platform:base-py2)]
diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -394,3 +394,68 @@ releases:
     - 1148-dont-filter-false-params.yml
     - 20210224-info_module_fixes.yml
     release_date: '2021-03-02'
+  2.1.0:
+    changes:
+      bugfixes:
+      - host - pass the right image id to the compute resource when creating a host
+        (https://github.com/theforeman/foreman-ansible-modules/issues/1160, https://bugzilla.redhat.com/show_bug.cgi?id=1911670)
+      minor_changes:
+      - Add a domain_info module
+      - Add a hostgroups role (https://github.com/theforeman/foreman-ansible-modules/issues/1116)
+      - Add a role `content_rhel` to perform basic setup for registering and syncing
+        RHEL content hosts
+      - Add content credentials role
+      - callback plugin - collect facts during the run, merge them correctly and upload
+        them once at the end
+      - compute_resource - add ``cloud`` param for the AzureRm provider, to select
+        which Azure cloud to use
+      - compute_resource - add ``sub_id`` parameter for handling the Azure Subscription
+        ID instead of the ``user`` parameter
+      - host - Add ``Redfish`` to list of possible BMC providers of an interface
+      - host, compute_profile - look up the correct id for storage pods and domains
+        given as part of ``volumes_attributes`` (https://bugzilla.redhat.com/show_bug.cgi?id=1885234)
+      - hostgroup - add a ``ansible_roles`` parameter (https://github.com/theforeman/foreman-ansible-modules/issues/1123)
+      - new ``content_views`` role to manage content views (https://github.com/theforeman/foreman-ansible-modules/issues/1111)
+      - new ``organizations`` role to manage organizations (https://github.com/theforeman/foreman-ansible-modules/issues/1109)
+      - subnet - add ``bmc_proxy`` parameter to configure BMC proxies for subnets
+    fragments:
+    - 1097-content-rhel-role.yml
+    - 1109-organizations-role.yml
+    - 1111-content_views_role.yml
+    - 1116-hostgroups-role.yml
+    - 1123-ansible-roles-for-hostgroups.yml
+    - 1160-pass-image-in-compute-attributes.yml
+    - 1196-content_credentials-role.yml
+    - azure-clouds.yml
+    - azure-subid.yml
+    - bz1885234-storage-lookup.yml
+    - domain-info-module.yml
+    - foreman-fact-upload.yml
+    - host-redfish-bmc.yml
+    - subnet-bmc-proxy-param.yml
+    modules:
+    - description: Fetch information about Content Views
+      name: content_view_info
+      namespace: ''
+    - description: Fetch information about Content Views
+      name: content_view_version_info
+      namespace: ''
+    - description: Fetch information about Domains
+      name: domain_info
+      namespace: ''
+    - description: Fetch information about Host Errata
+      name: host_errata_info
+      namespace: ''
+    - description: Fetch information about Red Hat Repositories
+      name: repository_set_info
+      namespace: ''
+    - description: Fetch information about Settings
+      name: setting_info
+      namespace: ''
+    - description: Fetch information about Subnets
+      name: subnet_info
+      namespace: ''
+    - description: Fetch information about Subscriptions
+      name: subscription_info
+      namespace: ''
+    release_date: '2021-05-20'
diff --git a/docs/cvmanager.md b/docs/cvmanager.md
@@ -15,11 +15,11 @@ To ease cleanup of old Content Views, we ship the `content_view_version_cleanup`
   roles:
     - role: redhat.satellite.content_view_version_cleanup
       vars:
-        server_url: https://satellite.example.com
-        username: "admin"
-        password: "changeme"
-        organization: "Default Organization"
-        content_view_version_cleanup_keep: 10
+        satellite_server_url: https://satellite.example.com
+        satellite_username: "admin"
+        satellite_password: "changeme"
+        satellite_organization: "Default Organization"
+        satellite_content_view_version_cleanup_keep: 10
 ```
 
 ## Automated Updates

diff --git a/docs/testing.md b/docs/testing.md
@@ -76,7 +76,6 @@ $ make sanity
 ## Writing tests
 
 The tests in this repository run playbooks that can be found in `tests/test_playbooks`.
-To be run, the name of the corresponding playbook must be listed in `tests/test_crud.py`.
 
 The playbooks should be self contained, target the features of a specific module and be able to run against an actual foreman instance.
 The structure would usually be something like setup -> run tests -> clean up.

diff --git a/galaxy.yml b/galaxy.yml
@@ -2,6 +2,7 @@ namespace: "redhat"
 name: "satellite"
 description: Ansible Modules to manage Satellite installations
 authors:
+  - "Adam Růžička <[email protected]>"
   - "AlanCoding <[email protected]>"
   - "Andrew Kofink <[email protected]>"
   - "Anthony Green <[email protected]>"
@@ -11,6 +12,7 @@ authors:
   - "Bernhard Suttner <[email protected]>"
   - "Bryan Kearney <[email protected]>"
   - "Chris Forkner <[email protected]>"
+  - "Chris Hindman <[email protected]>"
   - "Chris Snell <[email protected]>"
   - "Christoffer Reijer <[email protected]>"
   - "Deric Crago <[email protected]>"
@@ -20,6 +22,7 @@ authors:
   - "Evgeni Golov <[email protected]>"
   - "Ewoud Kohl van Wijngaarden <[email protected]>"
   - "Greg Swift <[email protected]>"
+  - "Hideki Saito <[email protected]>"
   - "Ismael Puerto <[email protected]>"
   - "Jameer Pathan <[email protected]>"
   - "James Stuart <[email protected]>"
@@ -62,7 +65,8 @@ authors:
   - "metalcated <[email protected]>"
   - "russianguppie <[email protected]>"
   - "willtome <[email protected]>"
-version: "2.0.1"
+  - "yifatmakias <[email protected]>"
+version: "2.1.0"
 license:
   - "GPL-3.0-or-later"
 tags:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		python3-rpm [(platform:redhat platform:base-py3)]
		rpm-python [(platform:redhat platform:base-py2)]