diff --git a/.github/tests/configure_controller.yml b/.github/tests/configure_controller.yml index 49b6713d1..b5ee4fec7 100644 --- 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 index cddfc3d75..f33bdcac7 100644 --- 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 index a0030a244..f94a0d8f6 100644 --- 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 index 8dd3bc993..824cf231c 100644 --- 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 index 852a2379f..31bbae543 100644 --- 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 index 5e65ce508..a41ed4e64 100644 --- 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 index d6273c44a..e5ca4903d 100644 --- 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 index 98bb683f3..07564d3ff 100644 --- 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 index be2b91501..0b541fa29 100644 --- 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 index 527b0570e..a83c7e363 100644 --- 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 index 8ebaa58dc..0dcc41282 100644 --- 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 index 49d7ae315..aa68c734e 100644 --- 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 index f7eeb412b..f6faa34f3 100644 --- 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 index a3c12e0db..a4f6ea2de 100644 --- 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 index 0c37afa29..6669ef073 100644 --- 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 index 1d22e81e1..46c8bf43d 100644 --- 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 index 1da724aa5..acafea87c 100644 --- 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 index 808dedf78..5939a9ca4 100644 --- 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 index 1ae2821fb..bbbcfabf6 100644 --- 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 index 1c2007c84..b85a865ba 100644 --- 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 index 640e05347..b46d79289 100644 --- 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 index 453c10bef..bc80ebb0a 100644 --- 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 index a9f255282..431fcde06 100644 --- 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 index 55112271d..7b813feae 100644 --- 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 index 754c41bdb..aafa45dc4 100644 --- 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 index d289cd4bc..ef806c48b 100644 --- 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 index 1431308e1..dc1648dbc 100644 --- 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 index de79e5cc0..380dc3fb8 100644 --- 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 index 1493b0037..eb062b1b2 100644 --- a/README.md +++ b/README.md @@ -38,10 +38,10 @@ 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: @@ -49,7 +49,7 @@ You can also include it in a `requirements.yml` file and install it with `ansibl ```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 index 936f16f05..01acf451b 100644 --- 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 new file mode 100644 index 000000000..d192b0504 --- /dev/null +++ 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 index 3e82e6727..166f12eb4 100644 --- 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 index 1ccbf4b41..33e1a0b66 100644 --- 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 index 1df306b23..6b703cf87 100644 --- 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 index a9f2fc94b..c6e706543 100644 --- 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 index a738306b1..9ec9c71fd 100644 --- 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 index c77127f83..cb76c5d45 100644 --- 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 diff --git a/roles/credential_types/README.md b/roles/credential_types/README.md index ce80547b8..29b85821b 100644 --- a/roles/credential_types/README.md +++ b/roles/credential_types/README.md @@ -219,7 +219,7 @@ controller_credential_types: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.credential_types, when: controller_credential_types is defined} + - {role: infra.controller_configuration.credential_types, when: controller_credential_types is defined} ``` ## License diff --git a/roles/credentials/README.md b/roles/credentials/README.md index 66f52a12a..c320bf656 100644 --- a/roles/credentials/README.md +++ b/roles/credentials/README.md @@ -155,7 +155,7 @@ controller_credentials: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.credentials, when: controller_credentials is defined} + - {role: infra.controller_configuration.credentials, when: controller_credentials is defined} ``` ## License diff --git a/roles/dispatch/README.md b/roles/dispatch/README.md index 03ba1d975..699755812 100644 --- a/roles/dispatch/README.md +++ b/roles/dispatch/README.md @@ -45,7 +45,7 @@ controller_configuration_dispatcher_roles: Note that each item has three elements: -- `role` which is the name of the role within redhat_cop.controller_configuration +- `role` which is the name of the role within infra.controller_configuration - `var` which is the variable which is used in that role. We use this to prevent the role being called if the variable is not set - `tags` the tags which are applied to the role so it is possible to apply tags to a playbook using the dispatcher with these tags. @@ -103,7 +103,7 @@ This also speeds up the overall role. Each individual role has its own variable ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - redhat_cop.controller_configuration.dispatch + - infra.controller_configuration.dispatch ``` ## License diff --git a/roles/dispatch/tasks/main.yml b/roles/dispatch/tasks/main.yml index e3ec23410..c2a4c0778 100644 --- a/roles/dispatch/tasks/main.yml +++ b/roles/dispatch/tasks/main.yml @@ -1,5 +1,5 @@ --- -- name: "Run redhat_cop.controller_configuration.{{ __role.role }}" +- name: "Run infra.controller_configuration.{{ __role.role }}" ansible.builtin.include_role: name: "{{ __role.role }}" apply: diff --git a/roles/execution_environments/README.md b/roles/execution_environments/README.md index ac44593f5..704a0ad7c 100644 --- a/roles/execution_environments/README.md +++ b/roles/execution_environments/README.md @@ -108,7 +108,7 @@ controller_execution_environments: tasks: - name: Add Execution Environments include_role: - name: redhat_cop.controller_configuration.execution_environments + name: infra.controller_configuration.execution_environments ``` ## License diff --git a/roles/filetree_create/README.md b/roles/filetree_create/README.md index 293b225a9..f84c5f150 100644 --- a/roles/filetree_create/README.md +++ b/roles/filetree_create/README.md @@ -60,7 +60,7 @@ A list of other roles hosted on Galaxy should go here, plus any details in regar roles: - - redhat_cop.controller_configuration.filetree_create + - infra.controller_configuration.filetree_create post_tasks: - name: "Delete the Authentication Token used" diff --git a/roles/filetree_create/automatetheautomation.md b/roles/filetree_create/automatetheautomation.md index 47aaf49a3..92e109dff 100644 --- a/roles/filetree_create/automatetheautomation.md +++ b/roles/filetree_create/automatetheautomation.md @@ -10,7 +10,7 @@ Now that some concepts are clear, let's summarize what the collection will do. B - **filetree_read**: An ansible role which reads variables from a hierarchical and scalable directory structure which is grouped based on the configuration code life-cycle. It could be used to run the role filetree_read to load variables followed by dispatch role to apply the configuration. - **filetree_create**: The role filetree_create is intended to be used as the first step to begin using the Configuration as Code on Ansible Tower or Ansible Automation Controller, when you already have a running instance of any of them. Obviously, you also could start to write your objects as code from scratch, but the idea behind the creation of that role is to simplify your lives and make that task a little bit easier. -- **object_diff**: An ansible role to manage the object diff of the AWX or Automation Controller configuration. This role leverage the controller_object_diff.py lookup plugin of the redhat_cop.controller_configuration, comparing two lists, one taken directly from the API and the other one from the git repository, and it could be used to delete objects in the AWX or Automation Controller that are not defined in the git repository list. +- **object_diff**: An ansible role to manage the object diff of the AWX or Automation Controller configuration. This role leverage the controller_object_diff.py lookup plugin of the infra.controller_configuration, comparing two lists, one taken directly from the API and the other one from the git repository, and it could be used to delete objects in the AWX or Automation Controller that are not defined in the git repository list. - **dispatch**: An Ansible Role to run all roles on Ansible Controller. Automation Webhook can be used to link a Git repository and Ansible automation natively. Once a repo link is setup, Ansible catches events (commits: push, merge, jobs, etc) from the Git system (GitHub, GitHub Enterprise, GitLab) and uses them to automatically trigger automation jobs to update projects, inventories, and perform deployments, all without requiring yet another third-party tool such as Jenkins. diff --git a/roles/filetree_read/README.md b/roles/filetree_read/README.md index 356cd9691..253ad8870 100644 --- a/roles/filetree_read/README.md +++ b/roles/filetree_read/README.md @@ -4,7 +4,7 @@ An ansible role which reads variables from a hierarchical and scalable directory ## Requirements -ansible-galaxy collection install -r tests/collections/requirements.yml to be installed Currently: awx.awx or ansible.controller and redhat_cop.controller_configuration. +ansible-galaxy collection install -r tests/collections/requirements.yml to be installed Currently: awx.awx or ansible.controller and infra.controller_configuration. ## Role Variables @@ -42,9 +42,9 @@ The following Variables set the organization where should be applied the configu ### Data Structure -- It accepts two data models as the roles in the redhat_cop.controller_configuration collection,a simple straightforward easy to maintain model, and another based on the controller api. +- It accepts two data models as the roles in the infra.controller_configuration collection,a simple straightforward easy to maintain model, and another based on the controller api. - Variables should be stored in yaml files. It could be used vault to encrypt sensitive data when needed. -- All variables should be taken from the awx or automation controller object roles from the redhat_cop.controller_configuration collection. +- All variables should be taken from the awx or automation controller object roles from the infra.controller_configuration collection. ```yaml --- @@ -319,7 +319,7 @@ The role is designed to be used with tags, each tags correspond to an AWX or Aut - block: - name: Include Tasks to load Galaxy credentials to be added to Organizations ansible.builtin.include_role: - name: redhat_cop.controller_configuration.filetree_read + name: infra.controller_configuration.filetree_read tasks_from: "{{ create_orgs_credentials }}" loop: - organizations.yml @@ -329,7 +329,7 @@ The role is designed to be used with tags, each tags correspond to an AWX or Aut - name: Include Tasks to add Galaxy credentials to Organizations ansible.builtin.include_role: - name: redhat_cop.controller_configuration.dispatch + name: infra.controller_configuration.dispatch apply: tags: - organizations @@ -341,8 +341,8 @@ The role is designed to be used with tags, each tags correspond to an AWX or Aut - {role: credentials, var: controller_credentials, tags: credentials} roles: - - {role: redhat_cop.controller_configuration.filetree_read } - - {role: redhat_cop.controller_configuration.dispatch } + - {role: infra.controller_configuration.filetree_read } + - {role: infra.controller_configuration.dispatch } post_tasks: - name: "Delete the Authentication Token used" diff --git a/roles/groups/README.md b/roles/groups/README.md index d9e5b9b4b..307f44027 100644 --- a/roles/groups/README.md +++ b/roles/groups/README.md @@ -148,7 +148,7 @@ controller_groups: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.groups, when: controller_groups is defined} + - {role: infra.controller_configuration.groups, when: controller_groups is defined} ``` ## License diff --git a/roles/hosts/README.md b/roles/hosts/README.md index d61c35d10..a97a5684f 100644 --- a/roles/hosts/README.md +++ b/roles/hosts/README.md @@ -136,7 +136,7 @@ controller_hosts: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.hosts, when: controller_hosts is defined} + - {role: infra.controller_configuration.hosts, when: controller_hosts is defined} ``` ## License diff --git a/roles/instance_groups/README.md b/roles/instance_groups/README.md index 992a82204..421f83184 100644 --- a/roles/instance_groups/README.md +++ b/roles/instance_groups/README.md @@ -101,7 +101,7 @@ controller_instance_groups: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.groups, when: controller_groups is defined} + - {role: infra.controller_configuration.groups, when: controller_groups is defined} ``` ## License diff --git a/roles/instances/README.md b/roles/instances/README.md index 3c95be888..eca33da09 100644 --- a/roles/instances/README.md +++ b/roles/instances/README.md @@ -98,7 +98,7 @@ controller_instances: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.instances, when: controller_instances is defined} + - {role: infra.controller_configuration.instances, when: controller_instances is defined} ``` ## License diff --git a/roles/inventories/README.md b/roles/inventories/README.md index e19151b5c..fcbed202c 100644 --- a/roles/inventories/README.md +++ b/roles/inventories/README.md @@ -149,7 +149,7 @@ controller_inventories: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.inventories, when: controller_inventories is defined} + - {role: infra.controller_configuration.inventories, when: controller_inventories is defined} ``` ## License diff --git a/roles/inventory_source_update/README.md b/roles/inventory_source_update/README.md index d854b8aa9..5c0ed4b04 100644 --- a/roles/inventory_source_update/README.md +++ b/roles/inventory_source_update/README.md @@ -106,7 +106,7 @@ controller_inventory_sources: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.inventory_source_update, when: controller_inventory_sources is defined} + - {role: infra.controller_configuration.inventory_source_update, when: controller_inventory_sources is defined} ``` diff --git a/roles/inventory_sources/README.md b/roles/inventory_sources/README.md index efee4c6c0..575790b66 100644 --- a/roles/inventory_sources/README.md +++ b/roles/inventory_sources/README.md @@ -162,7 +162,7 @@ controller_inventory_sources: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.inventory_sources, when: controller_inventory_sources is defined} + - {role: infra.controller_configuration.inventory_sources, when: controller_inventory_sources is defined} ``` ## License diff --git a/roles/job_launch/README.md b/roles/job_launch/README.md index e9c0e8e3b..1466bcc93 100644 --- a/roles/job_launch/README.md +++ b/roles/job_launch/README.md @@ -98,7 +98,7 @@ controller_launch_jobs: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.job_launch, when: controller_launch_jobs is defined} + - {role: infra.controller_configuration.job_launch, when: controller_launch_jobs is defined} ``` ## License diff --git a/roles/job_templates/README.md b/roles/job_templates/README.md index 67a83f25b..a472d3e1e 100644 --- a/roles/job_templates/README.md +++ b/roles/job_templates/README.md @@ -277,7 +277,7 @@ controller_templates: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.job_templates, when: controller_templates is defined} + - {role: infra.controller_configuration.job_templates, when: controller_templates is defined} ``` ## License diff --git a/roles/jobs_cancel/README.md b/roles/jobs_cancel/README.md index 64a61875b..9c9c41e47 100644 --- a/roles/jobs_cancel/README.md +++ b/roles/jobs_cancel/README.md @@ -78,7 +78,7 @@ controller_cancel_jobs: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.jobs_cancel, when: controller_cancel_jobs is defined} + - {role: infra.controller_configuration.jobs_cancel, when: controller_cancel_jobs is defined} ``` ## License diff --git a/roles/labels/README.md b/roles/labels/README.md index efd4bd943..f64fcd9a1 100644 --- a/roles/labels/README.md +++ b/roles/labels/README.md @@ -113,7 +113,7 @@ controller_labels: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.labels, when: controller_labels is defined} + - {role: infra.controller_configuration.labels, when: controller_labels is defined} ``` ## License diff --git a/roles/license/README.md b/roles/license/README.md index 5befd0fd8..6775f1fd7 100644 --- a/roles/license/README.md +++ b/roles/license/README.md @@ -100,7 +100,7 @@ controller_license: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.license, when: controller_license is defined} + - {role: infra.controller_configuration.license, when: controller_license is defined} ``` ## License diff --git a/roles/notification_templates/README.md b/roles/notification_templates/README.md index ed8ac1127..18de29298 100644 --- a/roles/notification_templates/README.md +++ b/roles/notification_templates/README.md @@ -173,7 +173,7 @@ controller_notifications: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.notification_templates, when: controller_notifications is defined} + - {role: infra.controller_configuration.notification_templates, when: controller_notifications is defined} ``` ## License diff --git a/roles/object_diff/README.md b/roles/object_diff/README.md index 318ffc891..18b96cb5d 100644 --- a/roles/object_diff/README.md +++ b/roles/object_diff/README.md @@ -1,10 +1,10 @@ # controller_configuration.object_diff -An ansible role to manage the object diff of the AWX or Automation Controller configuration. This role leverage the controller_object_diff.py lookup plugin of the redhat_cop.controller_configuration, comparing two lists, one taken directly from the API and the other one from the git repository, and it could be used to delete objects in the AWX or Automation Controller that are not defined in the git repository list. +An ansible role to manage the object diff of the AWX or Automation Controller configuration. This role leverage the controller_object_diff.py lookup plugin of the infra.controller_configuration, comparing two lists, one taken directly from the API and the other one from the git repository, and it could be used to delete objects in the AWX or Automation Controller that are not defined in the git repository list. ## Requirements -`ansible-galaxy collection install -r tests/collections/requirements.yml` to be installed. Currently: `awx.awx` or `ansible.controller` and `redhat_cop.controller_configuration`. +`ansible-galaxy collection install -r tests/collections/requirements.yml` to be installed. Currently: `awx.awx` or `ansible.controller` and `infra.controller_configuration`. ## Role Variables @@ -73,8 +73,8 @@ To correctly manage `roles`, they can only be defined by a super-admin organizat - always roles: - - role: redhat_cop.controller_configuration.filetree_read - - role: redhat_cop.controller_configuration.object_diff + - role: infra.controller_configuration.filetree_read + - role: infra.controller_configuration.object_diff vars: controller_configuration_object_diff_tasks: - {name: workflow_job_templates, var: controller_workflows, tags: workflow_job_templates} @@ -88,7 +88,7 @@ To correctly manage `roles`, they can only be defined by a super-admin organizat - {name: credentials, var: controller_credentials, tags: credentials} - {name: credential_types, var: controller_credential_types, tags: credential_types} - {name: organizations, var: controller_organizations, tags: organizations} - - role: redhat_cop.controller_configuration.dispatch + - role: infra.controller_configuration.dispatch vars: controller_configuration_dispatcher_roles: - {role: workflow_job_templates, var: controller_workflows, tags: workflow_job_templates} diff --git a/roles/object_diff/tasks/applications.yml b/roles/object_diff/tasks/applications.yml index 5eaee8b33..28bf86932 100644 --- a/roles/object_diff/tasks/applications.yml +++ b/roles/object_diff/tasks/applications.yml @@ -16,7 +16,7 @@ - name: "Find the difference of Application between what is on the Controller versus CasC on SCM" ansible.builtin.set_fact: - __applications_difference: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', + __applications_difference: "{{ lookup(controller_role_plugin, api_list=__controller_api_applications, compare_list=controller_applications, with_present=false, set_absent=true) }}" diff --git a/roles/object_diff/tasks/credential_types.yml b/roles/object_diff/tasks/credential_types.yml index 237ad0779..5d800d013 100644 --- a/roles/object_diff/tasks/credential_types.yml +++ b/roles/object_diff/tasks/credential_types.yml @@ -22,7 +22,7 @@ - name: "Find the difference of Credential Types between what is on the Controller versus CasC on SCM" ansible.builtin.set_fact: - __credential_types_difference: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', + __credential_types_difference: "{{ lookup(controller_role_plugin, api_list=__controller_api_credential_types, compare_list=controller_credential_types, with_present=false, set_absent=true) }}" diff --git a/roles/object_diff/tasks/credentials.yml b/roles/object_diff/tasks/credentials.yml index b4263d14f..ca5321b3a 100644 --- a/roles/object_diff/tasks/credentials.yml +++ b/roles/object_diff/tasks/credentials.yml @@ -19,7 +19,7 @@ - name: "Find the difference of Credentials between what is on the Controller versus CasC on SCM" ansible.builtin.set_fact: - __credentials_difference: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', + __credentials_difference: "{{ lookup(controller_role_plugin, api_list=__controller_api_credentials, compare_list=controller_credentials, with_present=false, set_absent=true) }}" diff --git a/roles/object_diff/tasks/execution_environments.yml b/roles/object_diff/tasks/execution_environments.yml index 612073bcf..c63c24cb0 100644 --- a/roles/object_diff/tasks/execution_environments.yml +++ b/roles/object_diff/tasks/execution_environments.yml @@ -16,7 +16,7 @@ - name: "Find the difference of Execution Environment between what is on the Controller versus CasC on SCM" ansible.builtin.set_fact: - __execution_environments_difference: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', + __execution_environments_difference: "{{ lookup(controller_role_plugin, api_list=__controller_api_execution_environments, compare_list=controller_execution_environments, with_present=false, set_absent=true) }}" diff --git a/roles/object_diff/tasks/groups.yml b/roles/object_diff/tasks/groups.yml index cd8c71127..7104f3f37 100644 --- a/roles/object_diff/tasks/groups.yml +++ b/roles/object_diff/tasks/groups.yml @@ -36,7 +36,7 @@ block: - name: "Find the difference of Groups between what is on the Controller versus CasC on SCM" ansible.builtin.set_fact: - __groups_difference: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', + __groups_difference: "{{ lookup(controller_role_plugin, query_params={'summary_fields.inventory.organization_id': controller_organization_id.id}, api_list=__controller_api_groups, compare_list=controller_groups, with_present=false, set_absent=true) diff --git a/roles/object_diff/tasks/hosts.yml b/roles/object_diff/tasks/hosts.yml index 5713c5c9f..aeadd54e9 100644 --- a/roles/object_diff/tasks/hosts.yml +++ b/roles/object_diff/tasks/hosts.yml @@ -37,7 +37,7 @@ block: - name: "Find the difference of Hosts between what is on the Controller versus CasC on SCM" ansible.builtin.set_fact: - __hosts_difference: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', + __hosts_difference: "{{ lookup(controller_role_plugin, query_params={'summary_fields.inventory.organization_id': controller_organization_id.id}, api_list=__controller_api_hosts, compare_list=controller_hosts, with_present=false, set_absent=true) diff --git a/roles/object_diff/tasks/instance_groups.yml b/roles/object_diff/tasks/instance_groups.yml index 50e72ecfe..8acc1590f 100644 --- a/roles/object_diff/tasks/instance_groups.yml +++ b/roles/object_diff/tasks/instance_groups.yml @@ -19,7 +19,7 @@ - name: "Find the difference of Instance Groups between what is on the Controller versus CasC on SCM" ansible.builtin.set_fact: - __instance_groups_difference: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', + __instance_groups_difference: "{{ lookup(controller_role_plugin, api_list=__controller_api_instance_groups, compare_list=controller_instance_groups, with_present=false, diff --git a/roles/object_diff/tasks/inventories.yml b/roles/object_diff/tasks/inventories.yml index 65e2930a9..f546e237b 100644 --- a/roles/object_diff/tasks/inventories.yml +++ b/roles/object_diff/tasks/inventories.yml @@ -18,7 +18,7 @@ - name: "Find the difference of Inventories between what is on the Controller versus CasC on SCM" ansible.builtin.set_fact: - __inventories_difference: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', + __inventories_difference: "{{ lookup(controller_role_plugin, api_list=__controller_api_inventories, compare_list=controller_inventories, with_present=false, set_absent=true) }}" diff --git a/roles/object_diff/tasks/inventory_sources.yml b/roles/object_diff/tasks/inventory_sources.yml index 6da6f9179..7e993f08a 100644 --- a/roles/object_diff/tasks/inventory_sources.yml +++ b/roles/object_diff/tasks/inventory_sources.yml @@ -18,7 +18,7 @@ - name: "Find the difference of Inventory Sources between what is on the Controller versus CasC on SCM" ansible.builtin.set_fact: - __inventory_sources_difference: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', + __inventory_sources_difference: "{{ lookup(controller_role_plugin, api_list=__controller_api_inventory_sources, compare_list=controller_inventory_sources, with_present=false, set_absent=true) diff --git a/roles/object_diff/tasks/job_templates.yml b/roles/object_diff/tasks/job_templates.yml index ce4d1a8eb..9926f1e26 100644 --- a/roles/object_diff/tasks/job_templates.yml +++ b/roles/object_diff/tasks/job_templates.yml @@ -18,7 +18,7 @@ - name: "Find the difference of Job Templates between what is on the Controller versus CasC on SCM" ansible.builtin.set_fact: - __job_templates_difference: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', + __job_templates_difference: "{{ lookup(controller_role_plugin, api_list=__controller_api_job_templates, compare_list=controller_templates, with_present=false, set_absent=true) }}" diff --git a/roles/object_diff/tasks/main.yml b/roles/object_diff/tasks/main.yml index 34bec9423..12d316a54 100644 --- a/roles/object_diff/tasks/main.yml +++ b/roles/object_diff/tasks/main.yml @@ -4,7 +4,7 @@ tags: - always block: - - name: "Check installed collections (block)" + - name: "Check installed module collections (block)" block: - name: "Check if the collection ansible.controller is installed" ansible.builtin.set_fact: @@ -27,6 +27,29 @@ ansible.builtin.debug: msg: "Using the 'controller_api' plugin from: {{ controller_api_plugin }}" + - name: "Check installed role collections (block)" + block: + - name: "Check if the collection infra.controller_configuration is installed" + ansible.builtin.set_fact: + infra_controller_collection_installed: "{{ lookup('ansible.builtin.pipe', 'ansible-galaxy collection list | grep -i infra.controller_configuration || echo NOTINSTALLED') }}" + failed_when: infra_controller_collection_installed is match('NOTINSTALLED') + rescue: + - name: "Check if the collection redhat_cop.controller_configuration is installed" + ansible.builtin.set_fact: + redhat_cop_collection_installed: "{{ lookup('ansible.builtin.pipe', 'ansible-galaxy collection list | grep -i redhat_cop.controller_configuration || echo NOTINSTALLED') }}" + failed_when: redhat_cop_collection_installed is match('NOTINSTALLED') + always: + - name: "Set the collection providing the controller_api lookup plugin" + ansible.builtin.set_fact: + controller_role_plugin: "{{ ('infra.controller_configuration.controller_object_diff' if infra_controller_collection_installed is defined) | default('redhat_cop.controller_configuration.controller_object_diff' if redhat_cop_collection_installed is defined) | default('NONE') }}" + - name: "Fail if no collection is detected" + ansible.builtin.fail: + msg: "One of the following collections is required to be installed: 'infra.controller_configuration' or 'redhat_cop.controller_configuration'." + when: controller_role_plugin is match('NONE') + - name: "Show the plugin we are using" + ansible.builtin.debug: + msg: "Using the 'controller_role' plugin from: {{ controller_role_plugin }}" + - name: "Check if the connection is to an Ansible Tower or to Automation Platform" ansible.builtin.set_fact: is_aap: "{{ lookup(controller_api_plugin, 'ping', diff --git a/roles/object_diff/tasks/notification_templates.yml b/roles/object_diff/tasks/notification_templates.yml index e3b8f53d1..b7ea000a5 100644 --- a/roles/object_diff/tasks/notification_templates.yml +++ b/roles/object_diff/tasks/notification_templates.yml @@ -16,7 +16,7 @@ - name: "Find the difference of Notification Template between what is on the Controller versus CasC on SCM" ansible.builtin.set_fact: - __notification_templates_difference: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', + __notification_templates_difference: "{{ lookup(controller_role_plugin, api_list=__controller_api_notification_templates, compare_list=controller_notifications, with_present=false, set_absent=true) }}" diff --git a/roles/object_diff/tasks/organizations.yml b/roles/object_diff/tasks/organizations.yml index a3e987711..e88c1666e 100644 --- a/roles/object_diff/tasks/organizations.yml +++ b/roles/object_diff/tasks/organizations.yml @@ -21,7 +21,7 @@ - name: "Find the difference of Organizations between what is on the Controller versus curated list." ansible.builtin.set_fact: - __organizations_difference: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', + __organizations_difference: "{{ lookup(controller_role_plugin, api_list=__controller_api_organizations, compare_list=controller_organizations, with_present=false, set_absent=true) }}" diff --git a/roles/object_diff/tasks/projects.yml b/roles/object_diff/tasks/projects.yml index 6ea7b93cf..3b119ab6c 100644 --- a/roles/object_diff/tasks/projects.yml +++ b/roles/object_diff/tasks/projects.yml @@ -18,7 +18,7 @@ - name: "Find the difference of Project between what is on the Controller versus CasC on SCM" ansible.builtin.set_fact: - __projects_difference: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', + __projects_difference: "{{ lookup(controller_role_plugin, api_list=__controller_api_projects, compare_list=controller_projects, with_present=false, set_absent=true) }}" diff --git a/roles/object_diff/tasks/roles.yml b/roles/object_diff/tasks/roles.yml index d17a5c6d6..095161f21 100644 --- a/roles/object_diff/tasks/roles.yml +++ b/roles/object_diff/tasks/roles.yml @@ -53,7 +53,7 @@ - name: "Find the difference of Roles between what is on the Controller versus CasC on SCM" ansible.builtin.set_fact: - __roles_difference: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', + __roles_difference: "{{ lookup(controller_role_plugin, api_list=__full_controller_api_roles, compare_list=controller_roles, with_present=false, set_absent=true) }}" diff --git a/roles/object_diff/tasks/schedules.yml b/roles/object_diff/tasks/schedules.yml index 110a3b77a..fe2994186 100644 --- a/roles/object_diff/tasks/schedules.yml +++ b/roles/object_diff/tasks/schedules.yml @@ -37,7 +37,7 @@ - name: "Find the difference of Schedule between what is on the Controller versus CasC on SCM" ansible.builtin.set_fact: - __schedules_difference: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', + __schedules_difference: "{{ lookup(controller_role_plugin, api_list=__controller_api_schedules, compare_list=controller_schedules, with_present=false, set_absent=true) }}" diff --git a/roles/object_diff/tasks/teams.yml b/roles/object_diff/tasks/teams.yml index 12ef352fb..d1abf599f 100644 --- a/roles/object_diff/tasks/teams.yml +++ b/roles/object_diff/tasks/teams.yml @@ -30,7 +30,7 @@ - name: "Find the difference of Teams between what is on the Controller versus CasC on SCM" ansible.builtin.set_fact: - __teams_difference: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', + __teams_difference: "{{ lookup(controller_role_plugin, api_list=__controller_api_teams, compare_list=controller_teams, with_present=false, diff --git a/roles/object_diff/tasks/user_accounts.yml b/roles/object_diff/tasks/user_accounts.yml index 0504bd4c1..1bfb32e5a 100644 --- a/roles/object_diff/tasks/user_accounts.yml +++ b/roles/object_diff/tasks/user_accounts.yml @@ -36,7 +36,7 @@ block: - name: "Find the difference of User Accounts between what is on the Controller versus CasC on SCM" ansible.builtin.set_fact: - __user_accounts_difference: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', + __user_accounts_difference: "{{ lookup(controller_role_plugin, api_list=__controller_api_user_accounts, compare_list=controller_user_accounts, with_present=false, set_absent=true) }}" diff --git a/roles/object_diff/tasks/workflow_job_templates.yml b/roles/object_diff/tasks/workflow_job_templates.yml index f26795e2c..2f3c93c8a 100644 --- a/roles/object_diff/tasks/workflow_job_templates.yml +++ b/roles/object_diff/tasks/workflow_job_templates.yml @@ -18,7 +18,7 @@ - name: "Find the difference of Workflow Job Templates between what is on the Controller versus CasC on SCM" ansible.builtin.set_fact: - __workflow_job_templates_difference: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', + __workflow_job_templates_difference: "{{ lookup(controller_role_plugin, api_list=__controller_api_workflow_job_templates, compare_list=controller_workflows, with_present=false, set_absent=true) diff --git a/roles/organizations/README.md b/roles/organizations/README.md index e5b31f4fd..9a43a43c1 100644 --- a/roles/organizations/README.md +++ b/roles/organizations/README.md @@ -163,7 +163,7 @@ controller_organizations: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.organizations, when: controller_organizations is defined} + - {role: infra.controller_configuration.organizations, when: controller_organizations is defined} ``` ## License diff --git a/roles/project_update/README.md b/roles/project_update/README.md index 16cab2796..202a9d2c5 100644 --- a/roles/project_update/README.md +++ b/roles/project_update/README.md @@ -115,7 +115,7 @@ controller_projects: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.project_update, when: controller_projects is defined} + - {role: infra.controller_configuration.project_update, when: controller_projects is defined} ``` diff --git a/roles/projects/README.md b/roles/projects/README.md index 4b13dd92f..5a0a85e69 100644 --- a/roles/projects/README.md +++ b/roles/projects/README.md @@ -149,7 +149,7 @@ controller_projects: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.projects, when: controller_projects is defined} + - {role: infra.controller_configuration.projects, when: controller_projects is defined} ``` ## License diff --git a/roles/roles/README.md b/roles/roles/README.md index b94876575..dbd660fcf 100644 --- a/roles/roles/README.md +++ b/roles/roles/README.md @@ -151,7 +151,7 @@ controller_roles: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.roles, when: controller_roles is defined} + - {role: infra.controller_configuration.roles, when: controller_roles is defined} ``` ## License diff --git a/roles/schedules/README.md b/roles/schedules/README.md index 8ef7da3ca..c1db6f125 100644 --- a/roles/schedules/README.md +++ b/roles/schedules/README.md @@ -137,7 +137,7 @@ controller_schedules: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.schedules, when: controller_schedules is defined} + - {role: infra.controller_configuration.schedules, when: controller_schedules is defined} ``` ## License diff --git a/roles/settings/README.md b/roles/settings/README.md index 8845b6e9c..4ee4dea42 100644 --- a/roles/settings/README.md +++ b/roles/settings/README.md @@ -140,7 +140,7 @@ controller_settings: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.settings, when: controller_settings is defined} + - {role: infra.controller_configuration.settings, when: controller_settings is defined} ``` ## License diff --git a/roles/teams/README.md b/roles/teams/README.md index 1fe4dcdc5..3b7805910 100644 --- a/roles/teams/README.md +++ b/roles/teams/README.md @@ -82,7 +82,7 @@ This also speeds up the overall role. ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.teams, when: controller_teams is defined} + - {role: infra.controller_configuration.teams, when: controller_teams is defined} ``` ## License diff --git a/roles/users/README.md b/roles/users/README.md index 5d5ad6d69..579846700 100644 --- a/roles/users/README.md +++ b/roles/users/README.md @@ -117,7 +117,7 @@ controller_user_accounts: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.users, when: controller_user_accounts is defined} + - {role: infra.controller_configuration.users, when: controller_user_accounts is defined} ``` ## License diff --git a/roles/workflow_job_templates/README.md b/roles/workflow_job_templates/README.md index c8c667add..79d7db395 100644 --- a/roles/workflow_job_templates/README.md +++ b/roles/workflow_job_templates/README.md @@ -402,7 +402,7 @@ controller_workflows: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.workflow_job_templates, when: controller_workflows is defined} + - {role: infra.controller_configuration.workflow_job_templates, when: controller_workflows is defined} ``` diff --git a/roles/workflow_launch/README.md b/roles/workflow_launch/README.md index b22a1dfd3..ca85e5ebe 100644 --- a/roles/workflow_launch/README.md +++ b/roles/workflow_launch/README.md @@ -85,7 +85,7 @@ controller_workflow_launch_jobs: ignore_files: [controller_config.yml.template] extensions: ["yml"] roles: - - {role: redhat_cop.controller_configuration.workflow_launch, when: controller_workflow_launch_jobs is defined} + - {role: infra.controller_configuration.workflow_launch, when: controller_workflow_launch_jobs is defined} ```