Infra update (#537)

* Fix incorrect required from no to yes inventory organization * update references from redhat_cop to infra --------- Co-authored-by: Tony Kay <tony.g.kay@gmail.com>
redhat-cop · Mar 15, 2023 · fddeeff · fddeeff
1 parent 11125e1
commit fddeeff
Show file tree

Hide file tree

Showing 88 changed files with 134 additions and 117 deletions.
diff --git a/.github/tests/configure_controller.yml b/.github/tests/configure_controller.yml
@@ -11,7 +11,7 @@
   # controller_password: changeme
   collections:
     - awx.awx
-    - redhat_cop.controller_configuration
+    - infra.controller_configuration
 
   pre_tasks:
 

diff --git a/.github/tests/configure_controller_export_model.yml b/.github/tests/configure_controller_export_model.yml
@@ -7,7 +7,7 @@
     controller_validate_certs: false
   collections:
     - awx.awx
-    - redhat_cop.controller_configuration
+    - infra.controller_configuration
   # Define following vars here, or in configs/controller_auth.yml
   # controller_hostname: controller.example.com
   # controller_username: admin

diff --git a/.github/tests/playbooks/README.md b/.github/tests/playbooks/README.md
@@ -14,16 +14,10 @@ Currently:
 
 ## Usage
 
-The following command will invoke the playbook with the awx collection
-
-```console
-ansible-playbook redhat_cop.controller_configuration.configure_awx.yml
-```
-
 The following command will invoke the playbook with the ansible.controller collection
 
 ```console
-ansible-playbook redhat_cop.controller_configuration.configure_controller.yml
+ansible-playbook infra.controller_configuration.configure_controller.yml
 ```
 
 ## Examples

diff --git a/.github/tests/playbooks/cd_gitlab_webhook_trigger.yml b/.github/tests/playbooks/cd_gitlab_webhook_trigger.yml
@@ -27,7 +27,7 @@
 
     - name: Configure Controller Job Launch | Launch launch_jobs Drop Diff (Delete)
       ansible.builtin.include_role:
-        name: redhat_cop.controller_configuration.job_launch
+        name: infra.controller_configuration.job_launch
       vars:
         controller_launch_jobs:
           - name: "{{ org_tags.key }} CasC_JobTemplates_AAP_Drop_Diff"
@@ -48,7 +48,7 @@
 
     - name: Configure Controller Job Launch | Launch launch_jobs creation
       ansible.builtin.include_role:
-        name: redhat_cop.controller_configuration.job_launch
+        name: infra.controller_configuration.job_launch
       vars:
         controller_launch_jobs:
           - name: "{{ org_tags.key }} CasC_JobTemplates_AAP_CD_Config_Controller"

diff --git a/.github/tests/playbooks/configure_awx.yml b/.github/tests/playbooks/configure_awx.yml
@@ -36,7 +36,7 @@
   connection: local
   collections:
     - awx.awx
-    - redhat_cop.controller_configuration
+    - infra.controller_configuration
   pre_tasks:
 
     - name: Include vars from configs directory

diff --git a/.github/tests/playbooks/configure_controller.yml b/.github/tests/playbooks/configure_controller.yml
@@ -36,7 +36,7 @@
   connection: local
   collections:
     - ansible.controller
-    - redhat_cop.controller_configuration
+    - infra.controller_configuration
   pre_tasks:
 
     - name: Include vars from configs directory

diff --git a/.github/tests/templates/collections/requirements.yml b/.github/tests/templates/collections/requirements.yml
@@ -3,5 +3,5 @@ collections:
   - name: awx.awx
   - name: ansible.tower
   - name: ansible.controller
-  - name: redhat_cop.controller_configuration
+  - name: infra.controller_configuration
 ...
diff --git a/.github/tests/templates/controller_config.yml b/.github/tests/templates/controller_config.yml
@@ -29,7 +29,7 @@
   gather_facts: false
   collections:
     - ansible.controller
-    - redhat_cop.controller_configuration
+    - infra.controller_configuration
 
   vars:
     absent_present: "present"

diff --git a/.github/tests/templates/tasks/manage_controller_settings.yml b/.github/tests/templates/tasks/manage_controller_settings.yml
@@ -6,7 +6,7 @@
     - alltags
 
 - import_role:
-    name: redhat_cop.controller_configuration.settings
+    name: infra.controller_configuration.settings
   tags:
     - settings
     - alltags
@@ -18,7 +18,7 @@
     - alltags
 
 - import_role:
-    name: redhat_cop.controller_configuration.settings
+    name: infra.controller_configuration.settings
   tags:
     - settings
     - alltags

diff --git a/.github/tests/templates/tasks/manage_credential_types.yml b/.github/tests/templates/tasks/manage_credential_types.yml
@@ -6,7 +6,7 @@
     - alltags
 
 - import_role:
-    name: redhat_cop.controller_configuration.credential_types
+    name: infra.controller_configuration.credential_types
   tags:
     - credtypes
     - alltags

diff --git a/.github/tests/templates/tasks/manage_credentials.yml b/.github/tests/templates/tasks/manage_credentials.yml
@@ -6,7 +6,7 @@
     - alltags
 
 - import_role:
-    name: redhat_cop.controller_configuration.credentials
+    name: infra.controller_configuration.credentials
   tags:
     - credentials
     - alltags

diff --git a/.github/tests/templates/tasks/manage_execution_environments.yml b/.github/tests/templates/tasks/manage_execution_environments.yml
@@ -6,7 +6,7 @@
     - alltags
 
 - import_role:
-    name: redhat_cop.controller_configuration.execution_environments
+    name: infra.controller_configuration.execution_environments
   tags:
     - ees
     - alltags

diff --git a/.github/tests/templates/tasks/manage_groups.yml b/.github/tests/templates/tasks/manage_groups.yml
@@ -6,7 +6,7 @@
     - alltags
 
 - import_role:
-    name: redhat_cop.controller_configuration.groups
+    name: infra.controller_configuration.groups
   tags:
     - groups
     - alltags

diff --git a/.github/tests/templates/tasks/manage_hosts.yml b/.github/tests/templates/tasks/manage_hosts.yml
@@ -6,7 +6,7 @@
     - alltags
 
 - import_role:
-    name: redhat_cop.controller_configuration.hosts
+    name: infra.controller_configuration.hosts
   tags:
     - hosts
     - alltags

diff --git a/.github/tests/templates/tasks/manage_instance_groups.yml b/.github/tests/templates/tasks/manage_instance_groups.yml
@@ -6,7 +6,7 @@
     - alltags
 
 - import_role:
-    name: redhat_cop.controller_configuration.instance_groups
+    name: infra.controller_configuration.instance_groups
   tags:
     - instancegroups
     - alltags

diff --git a/.github/tests/templates/tasks/manage_inventories.yml b/.github/tests/templates/tasks/manage_inventories.yml
@@ -6,7 +6,7 @@
     - alltags
 
 - import_role:
-    name: redhat_cop.controller_configuration.inventories
+    name: infra.controller_configuration.inventories
   tags:
     - inventory
     - alltags

diff --git a/.github/tests/templates/tasks/manage_inventory_sources.yml b/.github/tests/templates/tasks/manage_inventory_sources.yml
@@ -6,7 +6,7 @@
     - alltags
 
 - include_role:
-    name: redhat_cop.controller_configuration.inventory_sources
+    name: infra.controller_configuration.inventory_sources
   tags:
     - inventorysources
     - alltags

diff --git a/.github/tests/templates/tasks/manage_job_templates.yml b/.github/tests/templates/tasks/manage_job_templates.yml
@@ -6,7 +6,7 @@
     - alltags
 
 - import_role:
-    name: redhat_cop.controller_configuration.job_templates
+    name: infra.controller_configuration.job_templates
   tags:
     - jobtemplates
     - alltags

diff --git a/.github/tests/templates/tasks/manage_labels.yml b/.github/tests/templates/tasks/manage_labels.yml
@@ -6,7 +6,7 @@
     - alltags
 
 - import_role:
-    name: redhat_cop.controller_configuration.labels
+    name: infra.controller_configuration.labels
   tags:
     - labels
     - alltags

diff --git a/.github/tests/templates/tasks/manage_notification_templates.yml b/.github/tests/templates/tasks/manage_notification_templates.yml
@@ -6,7 +6,7 @@
     - alltags
 
 - import_role:
-    name: redhat_cop.controller_configuration.notification_templates
+    name: infra.controller_configuration.notification_templates
   tags:
     - notifications
     - alltags

diff --git a/.github/tests/templates/tasks/manage_organizations.yml b/.github/tests/templates/tasks/manage_organizations.yml
@@ -42,7 +42,7 @@
     - alltags
 
 - include_role:
-    name: redhat_cop.controller_configuration.organizations
+    name: infra.controller_configuration.organizations
   tags:
     - orgs
     - alltags

diff --git a/.github/tests/templates/tasks/manage_projects.yml b/.github/tests/templates/tasks/manage_projects.yml
@@ -6,7 +6,7 @@
     - alltags
 
 - import_role:
-    name: redhat_cop.controller_configuration.projects
+    name: infra.controller_configuration.projects
   tags:
     - projects
     - alltags

diff --git a/.github/tests/templates/tasks/manage_roles.yml b/.github/tests/templates/tasks/manage_roles.yml
@@ -6,7 +6,7 @@
     - alltags
 
 - import_role:
-    name: redhat_cop.controller_configuration.roles
+    name: infra.controller_configuration.roles
   tags:
     - roles
     - alltags

diff --git a/.github/tests/templates/tasks/manage_schedules.yml b/.github/tests/templates/tasks/manage_schedules.yml
@@ -6,7 +6,7 @@
     - alltags
 
 - import_role:
-    name: redhat_cop.controller_configuration.schedules
+    name: infra.controller_configuration.schedules
   tags:
     - schedules
     - alltags

diff --git a/.github/tests/templates/tasks/manage_teams.yml b/.github/tests/templates/tasks/manage_teams.yml
@@ -6,7 +6,7 @@
     - alltags
 
 - import_role:
-    name: redhat_cop.controller_configuration.teams
+    name: infra.controller_configuration.teams
   tags:
     - teams
     - alltags

diff --git a/.github/tests/templates/tasks/manage_users.yml b/.github/tests/templates/tasks/manage_users.yml
@@ -6,7 +6,7 @@
     - alltags
 
 - import_role:
-    name: redhat_cop.controller_configuration.users
+    name: infra.controller_configuration.users
   tags:
     - users
     - alltags

diff --git a/.github/tests/templates/tasks/manage_workflow_templates.yml b/.github/tests/templates/tasks/manage_workflow_templates.yml
@@ -6,7 +6,7 @@
     - alltags
 
 - import_role:
-    name: redhat_cop.controller_configuration.workflow_job_templates
+    name: infra.controller_configuration.workflow_job_templates
   tags:
     - workflows
     - alltags

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,5 +1,5 @@
 =================================================
-redhat_cop.controller_configuration Release Notes
+infra.controller_configuration Release Notes
 =================================================
 
 .. contents:: Topics

diff --git a/README.md b/README.md
@@ -38,18 +38,18 @@ Click the `Content` button to see the list of content included in this collectio
 
 ## Installing this collection
 
-You can install the redhat_cop.controller_configuration collection with the Ansible Galaxy CLI:
+You can install the infra.controller_configuration.collection with the Ansible Galaxy CLI:
 
 ```console
-ansible-galaxy collection install redhat_cop.controller_configuration
+ansible-galaxy collection install infra.controller_configuration
 ```
 
 You can also include it in a `requirements.yml` file and install it with `ansible-galaxy collection install -r requirements.yml`, using the format:
 
 ```yaml
 ---
 collections:
-  - name: redhat_cop.controller_configuration
+  - name: infra.controller_configuration
     # If you need a specific version of the collection, you can specify like this:
     # version: ...
 ```
@@ -62,16 +62,10 @@ If you were using a version of redhat_cop.tower_configuration, please refer to o
 
 The awx.awx or ansible.controller collection must be invoked in the playbook in order for Ansible to pick up the correct modules to use.
 
-The following command will invoke the playbook with the awx collection
+The following command will invoke the collection playbook. This is considered a starting point for the collection.
 
 ```console
-ansible-playbook redhat_cop.controller_configuration.configure_awx.yml
-```
-
-The following command will invoke the playbook with the ansible.controller collection
-
-```console
-ansible-playbook redhat_cop.controller_configuration.configure_controller.yml
+ansible-playbook infra.controller_configuration.configure_controller.yml
 ```
 
 Otherwise it will look for the modules only in your base installation. If there are errors complaining about "couldn't resolve module/action" this is the most likely cause.

diff --git a/changelogs/config.yaml b/changelogs/config.yaml
@@ -28,7 +28,7 @@ sections:
   - Bugfixes
 - - known_issues
   - Known Issues
-title: redhat_cop.controller_configuration
+title: infra.controller_configuration
 trivial_section_name: trivial
 use_fqcn: true
 ...
diff --git a/changelogs/fragments/redhat_to_infra_conversion.yml b/changelogs/fragments/redhat_to_infra_conversion.yml
@@ -0,0 +1,6 @@
+---
+minor_changes:
+  - removed references to redhat_cop as a collection namespace in the readme files.
+breaking_changes:
+  - updated object_diff role to use the infra namespace, that means to use the role it requires the infra version of the collection. Previous version required the redhat_cop
+...
diff --git a/docs/CONVERSION_GUIDE.md b/docs/CONVERSION_GUIDE.md
@@ -18,7 +18,7 @@ Otherwise it will look for the modules only in your base installation. If there
     controller_validate_certs: false
   collections:
     - awx.awx
-    - redhat_cop.controller_configuration
+    - infra.controller_configuration
 ```
 
 ## Variable name changes

diff --git a/plugins/lookup/controller_object_diff.py b/plugins/lookup/controller_object_diff.py
@@ -67,13 +67,13 @@
 
 - name: "Find the difference of Project between what is on the Controller versus curated list."
   set_fact:
-    project_difference: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff',
+    project_difference: "{{ lookup('infra.controller_configuration.controller_object_diff',
       api_list=controller_api_results, compare_list=differential_item.differential_test_items,
       with_present=true, set_absent=true ) }}"
 
 - name: Add Projects
   include_role:
-    name: redhat_cop.controller_configuration.projects
+    name: infra.controller_configuration.projects
   vars:
     controller_projects: "{{ project_difference }}"
 

diff --git a/roles/ad_hoc_command/README.md b/roles/ad_hoc_command/README.md
@@ -95,7 +95,7 @@ controller_ad_hoc_commands:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: redhat_cop.controller_configuration.ad_hoc_command, when: controller_ad_hoc_commands is defined}
+    - {role: infra.controller_configuration.ad_hoc_command, when: controller_ad_hoc_commands is defined}
 
 ```
 

diff --git a/roles/ad_hoc_command_cancel/README.md b/roles/ad_hoc_command_cancel/README.md
@@ -87,7 +87,7 @@ controller_ad_hoc_commands_cancel:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: redhat_cop.controller_configuration.ad_hoc_command_cancel, when: controller_ad_hoc_commands is defined}
+    - {role: infra.controller_configuration.ad_hoc_command_cancel, when: controller_ad_hoc_commands is defined}
 ```
 
 ## License

diff --git a/roles/applications/README.md b/roles/applications/README.md
@@ -118,7 +118,7 @@ controller_applications:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: redhat_cop.controller_configuration.applications, when: controller_applications is defined}
+    - {role: infra.controller_configuration.applications, when: controller_applications is defined}
 ```
 
 ## License

diff --git a/roles/credential_input_sources/README.md b/roles/credential_input_sources/README.md
@@ -122,7 +122,7 @@ controller_credential_input_sources:
         ignore_files: [controller_config.yml.template]
         extensions: ["yml"]
   roles:
-    - {role: redhat_cop.controller_configuration.credential_input_sources, when: controller_credential_input_sources is defined}
+    - {role: infra.controller_configuration.credential_input_sources, when: controller_credential_input_sources is defined}
 ```
 
 ## License
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ @@
         - alltags
     - import_role:
-        name: redhat_cop.controller_configuration.execution_environments
+        name: infra.controller_configuration.execution_environments
       tags:
         - ees
         - alltags
@@ Expand Down @@