diff --git a/CONVERSION_GUIDE.md b/CONVERSION_GUIDE.md index 1b99585a0..ae4b56ff4 100644 --- a/CONVERSION_GUIDE.md +++ b/CONVERSION_GUIDE.md @@ -86,13 +86,15 @@ ah_configuration vars: - aap_teams <- ah_groups - aap_user_accounts <- ah_users -- ah_namespaces -- ah_collections -- ah_ee_registries -- ah_ee_repositories -- ah_ee_images -- ah_collection_remotes -- ah_collection_repositories +- hub_namespaces <- ah_namespaces +- hub_collections <- ah_collections +- hub_ee_registries <- ah_ee_registries +- hub_ee_repositories <- ah_ee_repositories +- hub_ee_images <- ah_ee_images +- hub_collection_remotes <- ah_collection_remotes +- hub_collection_repositories <- ah_collection_repositories +- hub_group_roles <- ah_group_roles +- hub_roles <- ah_roles controller_configuration vars: @@ -175,7 +177,7 @@ controller_configuration_projects_loop_delay however ah_configuration_collection_repository_async_delay is now -ah_configuration_collection_repository_loop_delay +hub_configuration_collection_repository_loop_delay These are the following global variables: @@ -204,7 +206,7 @@ Format: - `prefix`+`role_name`+`_loop_delay` - `prefix`+`role_name`+`_async_dir` -use these to tweak how the role runs, this is particulary useful for projects syncing, long lists of job templates, and other tasks that can take a while to loop around. These all have defaults, and each global var is described above as to what it does. +use these to tweak how the role runs, this is particularly useful for projects syncing, long lists of job templates, and other tasks that can take a while to loop around. These all have defaults, and each global var is described above as to what it does. ## Dispatch changes diff --git a/changelogs/fragments/hub_vars.yml b/changelogs/fragments/hub_vars.yml new file mode 100644 index 000000000..51c79211a --- /dev/null +++ b/changelogs/fragments/hub_vars.yml @@ -0,0 +1,4 @@ +--- +major_changes: + - renamed some more vars that got missed in the new naming convention. +... diff --git a/galaxy.yml b/galaxy.yml index fe6ee7ae7..e885373a3 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -1,7 +1,7 @@ --- namespace: infra name: aap_configuration -version: 3.0.0 +version: 3.1.0 description: A collection of roles to manage Ansible Controller readme: README.md authors: diff --git a/roles/dispatch/README.md b/roles/dispatch/README.md index 1cc8fa871..cd3d4a750 100644 --- a/roles/dispatch/README.md +++ b/roles/dispatch/README.md @@ -11,7 +11,7 @@ This is a meta role, its purpose is to run the other roles in the collection, it ```yaml aap_configuration_dispatcher_roles: > {{ gateway_configuration_dispatcher_roles - + ah_configuration_dispatcher_roles + + hub_configuration_dispatcher_roles + controller_configuration_dispatcher_roles + eda_configuration_dispatcher_roles }} @@ -70,42 +70,42 @@ gateway_configuration_dispatcher_roles: #### Hub Roles ```yaml -ah_configuration_dispatcher_roles: +hub_configuration_dispatcher_roles: - role: hub_namespace - var: ah_namespaces + var: hub_namespaces tags: namespaces - role: hub_collection - var: ah_collections + var: hub_collections tags: collections - role: hub_ee_registry - var: ah_ee_registries + var: hub_ee_registries tags: registries - role: hub_ee_repository - var: ah_ee_repositories + var: hub_ee_repositories tags: repos - role: hub_ee_repository_sync - var: ah_ee_repository_sync + var: hub_ee_repository_sync tags: reposync - role: hub_ee_image - var: ah_ee_images + var: hub_ee_images tags: images - role: hub_ee_registry - var: ah_ee_registries + var: hub_ee_registries tags: registry - role: hub_ee_registry_index - var: ah_ee_registries + var: hub_ee_registries tags: ee_indices - role: hub_ee_registry_sync - var: ah_ee_registries + var: hub_ee_registries tags: regsync - role: hub_collection_remote - var: ah_collection_remotes + var: hub_collection_remotes tags: collectionremote - role: hub_collection_repository - var: ah_collection_repositories + var: hub_collection_repositories tags: collectionsrep - role: hub_collection_repository_sync - var: ah_collection_repositories + var: hub_collection_repositories tags: collectionsrepsync ``` diff --git a/roles/dispatch/defaults/main.yml b/roles/dispatch/defaults/main.yml index e4627d1d7..61748ffde 100644 --- a/roles/dispatch/defaults/main.yml +++ b/roles/dispatch/defaults/main.yml @@ -43,42 +43,42 @@ gateway_configuration_dispatcher_roles: var: aap_user_accounts tags: teams -ah_configuration_dispatcher_roles: +hub_configuration_dispatcher_roles: - role: hub_namespace - var: ah_namespaces + var: hub_namespaces tags: namespaces - role: hub_collection - var: ah_collections + var: hub_collections tags: collections - role: hub_ee_registry - var: ah_ee_registries + var: hub_ee_registries tags: registries - role: hub_ee_repository - var: ah_ee_repositories + var: hub_ee_repositories tags: repos - role: hub_ee_repository_sync - var: ah_ee_repository_sync + var: hub_ee_repository_sync tags: reposync - role: hub_ee_image - var: ah_ee_images + var: hub_ee_images tags: images - role: hub_ee_registry - var: ah_ee_registries + var: hub_ee_registries tags: registry - role: hub_ee_registry_index - var: ah_ee_registries + var: hub_ee_registries tags: ee_indices - role: hub_ee_registry_sync - var: ah_ee_registries + var: hub_ee_registries tags: regsync - role: hub_collection_remote - var: ah_collection_remotes + var: hub_collection_remotes tags: collectionremote - role: hub_collection_repository - var: ah_collection_repositories + var: hub_collection_repositories tags: collectionsrep - role: hub_collection_repository_sync - var: ah_collection_repositories + var: hub_collection_repositories tags: collectionsrepsync controller_configuration_dispatcher_roles: @@ -191,7 +191,7 @@ eda_configuration_dispatcher_roles: aap_configuration_dispatcher_roles: > {{ gateway_configuration_dispatcher_roles - + ah_configuration_dispatcher_roles + + hub_configuration_dispatcher_roles + controller_configuration_dispatcher_roles + eda_configuration_dispatcher_roles }} diff --git a/roles/dispatch/meta/argument_specs.yml b/roles/dispatch/meta/argument_specs.yml index 7e9380c97..fe2679cdb 100644 --- a/roles/dispatch/meta/argument_specs.yml +++ b/roles/dispatch/meta/argument_specs.yml @@ -112,49 +112,49 @@ argument_specs: - role: controller_workflow_launch var: controller_workflow_launch_jobs tags: workflow_launch - ah_configuration_dispatcher_roles: + hub_configuration_dispatcher_roles: default: - - role: pah_group - var: ah_groups + - role: hub_group + var: aap_teams tags: groups - - role: pah_user + - role: hub_user var: aap_user_accounts tags: users - - role: pah_namespace - var: ah_namespaces + - role: hub_namespace + var: hub_namespaces tags: namespaces - - role: pah_collection - var: ah_collections + - role: hub_collection + var: hub_collections tags: collections - - role: pah_ee_registry - var: ah_ee_registries + - role: hub_ee_registry + var: hub_ee_registries tags: registries - - role: pah_ee_repository - var: ah_ee_repositories + - role: hub_ee_repository + var: hub_ee_repositories tags: repos - - role: pah_ee_repository_sync - var: ah_ee_repository_sync + - role: phub_ee_repository_sync + var: hub_ee_repository_sync tags: reposync - - role: pah_ee_image - var: ah_ee_images + - role: hub_ee_image + var: hub_ee_images tags: images - - role: pah_ee_registry_index - var: ah_ee_registries + - role: hub_ee_registry_index + var: hub_ee_registries tags: indices - - role: pah_ee_registry_sync - var: ah_ee_registries + - role: hub_ee_registry_sync + var: hub_ee_registries tags: regsync - - role: pah_collection_remote - var: ah_collection_remotes + - role: hub_collection_remote + var: hub_collection_remotes tags: collectionremote - - role: pah_collection_repository - var: ah_collection_repositories + - role: hub_collection_repository + var: hub_collection_repositories tags: collectionsrep - - role: pah_collection_repository_sync - var: ah_collection_repositories + - role: hub_collection_repository_sync + var: hub_collection_repositories tags: collectionsrepsync - - role: pah_group_roles - var: ah_group_roles + - role: hub_group_roles + var: hub_group_roles tags: group_roles eda_configuration_dispatcher_roles: default: diff --git a/roles/dispatch/tests/configs/images.yml b/roles/dispatch/tests/configs/images.yml index 151a031b5..7425681e9 100644 --- a/roles/dispatch/tests/configs/images.yml +++ b/roles/dispatch/tests/configs/images.yml @@ -1,5 +1,5 @@ --- -ah_ee_images: +hub_ee_images: - name: ansible-automation-platform-22-early-access/ee-supported-rhel8:2.0.0-15 state: present append: false diff --git a/roles/dispatch/tests/configs/registries.yml b/roles/dispatch/tests/configs/registries.yml index 1ca54dd40..2b2ed5d1c 100644 --- a/roles/dispatch/tests/configs/registries.yml +++ b/roles/dispatch/tests/configs/registries.yml @@ -1,5 +1,5 @@ --- -ah_ee_registries: +hub_ee_registries: - name: registry.redhat url: registry.redhat.io username: myuser diff --git a/roles/dispatch/tests/configs/repositories.yml b/roles/dispatch/tests/configs/repositories.yml index 3372ad716..d429ec93d 100644 --- a/roles/dispatch/tests/configs/repositories.yml +++ b/roles/dispatch/tests/configs/repositories.yml @@ -1,5 +1,5 @@ --- -ah_ee_repositories: +hub_ee_repositories: - name: abc123 description: string readme: "# My EE repository" diff --git a/roles/hub_collection/README.md b/roles/hub_collection/README.md index ab04171e9..83dbea563 100644 --- a/roles/hub_collection/README.md +++ b/roles/hub_collection/README.md @@ -15,9 +15,9 @@ An Ansible Role to update, or destroy Automation Hub Collections. |`aap_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Galaxy or Automation Hub host.|| |`ah_path_prefix`|""|no|API path used to access the api. Either galaxy, automation-hub, or custom|| |`aap_configuration_async_dir`|`null`|no|Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`.|| -|`ah_collections`|`see below`|yes|Data structure describing your collections, described below.|| +|`hub_collections`|`see below`|yes|Data structure describing your collections, described below.|| -These are the sub options for the vars `ah_collections` which are dictionaries with the options you want. See examples for details. +These are the sub options for the vars `hub_collections` which are dictionaries with the options you want. See examples for details. |Variable Name|Default Value|Required|Description|Example| |:---:|:---:|:---:|:---:|:---:| @@ -45,24 +45,24 @@ This also speeds up the overall role. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| |`aap_configuration_async_timeout`|1000|no|This variable sets the async timeout for the role globally.| -|`ah_configuration_collection_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| +|`hub_configuration_collection_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| |`aap_configuration_async_retries`|50|no|This variable sets the number of retries to attempt for the role globally.| -|`ah_configuration_collection_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| +|`hub_configuration_collection_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| |`aap_configuration_loop_delay`|1000|no|This variable sets the loop_delay for the role globally.| -|`ah_configuration_collection_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| +|`hub_configuration_collection_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| |`aap_configuration_async_delay`|1|no|This sets the delay between retries for the role globally.| -|`ah_configuration_collection_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| +|`hub_configuration_collection_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| ### Secure Logging Variables The following Variables compliment each other. If Both variables are not set, secure logging defaults to false. The role defaults to False as normally the add repository task does not include sensitive information. -ah_configuration_repository_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. +hub_configuration_repository_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| -|`ah_configuration_collection_secure_logging`|`False`|no|Whether or not to include the sensitive collection role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| +|`hub_configuration_collection_secure_logging`|`False`|no|Whether or not to include the sensitive collection role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| |`aap_configuration_secure_logging`|`False`|no|This variable enables secure logging as well, but is shared across multiple roles, see above.| ## Data Structure @@ -73,7 +73,7 @@ ah_configuration_repository_secure_logging defaults to the value of aap_configur ```yaml --- -ah_collections: +hub_collections: - namespace: 'awx' name: 'awx' path: /var/tmp/collections/awx_awx-15.0.0.tar.gz diff --git a/roles/hub_collection/defaults/main.yml b/roles/hub_collection/defaults/main.yml index 307f8d346..78627a97f 100644 --- a/roles/hub_collection/defaults/main.yml +++ b/roles/hub_collection/defaults/main.yml @@ -7,7 +7,7 @@ # aap_validate_certs: false # These are the default variables specific to the collection role -ah_collections: [] +hub_collections: [] # possible fields: # - namespace # - name @@ -18,10 +18,10 @@ ah_collections: [] # - overwrite_existing # - state -ah_configuration_collection_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" -ah_configuration_collection_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" -ah_configuration_collection_async_retries: "{{ aap_configuration_async_retries | default(50) }}" -ah_configuration_collection_async_delay: "{{ aap_configuration_async_delay | default(1) }}" -ah_configuration_collection_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" +hub_configuration_collection_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" +hub_configuration_collection_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" +hub_configuration_collection_async_retries: "{{ aap_configuration_async_retries | default(50) }}" +hub_configuration_collection_async_delay: "{{ aap_configuration_async_delay | default(1) }}" +hub_configuration_collection_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" aap_configuration_async_dir: null ... diff --git a/roles/hub_collection/meta/argument_specs.yml b/roles/hub_collection/meta/argument_specs.yml index 732b6e573..e90bc692e 100644 --- a/roles/hub_collection/meta/argument_specs.yml +++ b/roles/hub_collection/meta/argument_specs.yml @@ -3,7 +3,7 @@ argument_specs: main: short_description: An Ansible Role to update, or destroy Automation Hub Collections. options: - ah_collections: + hub_collections: default: [] required: false description: Data structure describing your collections to manage. @@ -11,7 +11,7 @@ argument_specs: elements: dict # Async variables - ah_configuration_collection_async_retries: + hub_configuration_collection_async_retries: default: "{{ aap_configuration_async_retries | default(50) }}" required: false description: This variable sets the number of retries to attempt for the role. @@ -19,7 +19,7 @@ argument_specs: default: 50 required: false description: This variable sets number of retries across all roles as a default. - ah_configuration_collection_async_delay: + hub_configuration_collection_async_delay: default: "{{ aap_configuration_async_delay | default(1) }}" required: false description: This variable sets delay between retries for the role. @@ -33,7 +33,7 @@ argument_specs: description: Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`. # No_log variables - ah_configuration_collection_secure_logging: + hub_configuration_collection_secure_logging: default: "{{ aap_configuration_secure_logging | default(false) }}" required: false type: bool diff --git a/roles/hub_collection/tasks/main.yml b/roles/hub_collection/tasks/main.yml index 5e7bb8ddc..9767dff52 100644 --- a/roles/hub_collection/tasks/main.yml +++ b/roles/hub_collection/tasks/main.yml @@ -12,7 +12,7 @@ # when: # - ah_token is not defined # - lookup("ansible.builtin.env", "AH_API_TOKEN") == "" -# - ah_collections | length > 1 +# - hub_collections | length > 1 - name: Update or destroy Automation Hub Collection ansible.hub.ah_collection: @@ -34,13 +34,13 @@ ah_path_prefix: "{{ ah_path_prefix | default(omit) }}" validate_certs: "{{ aap_validate_certs | default(omit) }}" request_timeout: "{{ aap_request_timeout | default(omit) }}" - loop: "{{ ah_collections }}" + loop: "{{ hub_collections }}" loop_control: loop_var: __hub_collection_item label: "{{ __operation.verb }} the collection {{ __hub_collection_item.name }} in Hub" - pause: "{{ ah_configuration_collection_loop_delay }}" - no_log: "{{ ah_configuration_collection_secure_logging }}" - async: "{{ ah_configuration_collection_async_timeout }}" + pause: "{{ hub_configuration_collection_loop_delay }}" + no_log: "{{ hub_configuration_collection_secure_logging }}" + async: "{{ hub_configuration_collection_async_timeout }}" poll: 0 register: __collections_job_async changed_when: not __collections_job_async.changed @@ -57,14 +57,14 @@ jid: "{{ __collections_job_async_result_item.ansible_job_id }}" register: __collections_job_async_result until: __collections_job_async_result.finished - retries: "{{ ah_configuration_collection_async_retries }}" - delay: "{{ ah_configuration_collection_async_delay }}" + retries: "{{ hub_configuration_collection_async_retries }}" + delay: "{{ hub_configuration_collection_async_delay }}" loop: "{{ __collections_job_async.results }}" loop_control: loop_var: __collections_job_async_result_item label: "{{ __operation.verb }} Collection {{ __collections_job_async_result_item.__hub_collection_item.name }} | Wait for finish the Collection {{ __operation.action }}" when: __collections_job_async_result_item.ansible_job_id is defined - no_log: "{{ ah_configuration_collection_secure_logging }}" + no_log: "{{ hub_configuration_collection_secure_logging }}" vars: __operation: "{{ operation_translate[__collections_job_async_result_item.state | default(platform_state) | default('present')] }}" ansible_async_dir: '{{ aap_configuration_async_dir }}' diff --git a/roles/hub_collection_remote/README.md b/roles/hub_collection_remote/README.md index a397875a0..a69d0ad05 100644 --- a/roles/hub_collection_remote/README.md +++ b/roles/hub_collection_remote/README.md @@ -15,7 +15,7 @@ An Ansible Role to create a Collection Remote Repository. |`aap_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Galaxy or Automation Hub host.|| |`ah_path_prefix`|""|no|API path used to access the api. Either galaxy, automation-hub, or custom|| |`aap_configuration_async_dir`|`null`|no|Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`.|| -|`ah_collection_remotes`|`see below`|yes|Data structure describing your collection remote repository, described below.|| +|`hub_collection_remotes`|`see below`|yes|Data structure describing your collection remote repository, described below.|| The `aap_configuration_async_dir` variable sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`. @@ -25,11 +25,11 @@ The default value is set to `null` which uses the Ansible Default of `/root/.an The following Variables compliment each other. If Both variables are not set, secure logging defaults to false. The role defaults to False as normally the add repository task does not include sensitive information. -ah_configuration_repository_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. +hub_configuration_repository_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| -|`ah_configuration_collection_remote_secure_logging`|`False`|no|Whether or not to include the sensitive Namespace role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| +|`hub_configuration_collection_remote_secure_logging`|`False`|no|Whether or not to include the sensitive Namespace role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| |`aap_configuration_secure_logging`|`False`|no|This variable enables secure logging as well, but is shared across multiple roles, see above.| ### Asynchronous Retry Variables @@ -42,13 +42,13 @@ This also speeds up the overall role. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| |`aap_configuration_async_timeout`|1000|no|This variable sets the async timeout for the role globally.| -|`ah_configuration_collection_remote_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| +|`hub_configuration_collection_remote_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| |`aap_configuration_async_retries`|50|no|This variable sets the number of retries to attempt for the role globally.| -|`ah_configuration_collection_remote_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| +|`hub_configuration_collection_remote_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| |`aap_configuration_loop_delay`|1000|no|This variable sets the loop_delay for the role globally.| -|`ah_configuration_collection_remote_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| +|`hub_configuration_collection_remote_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| |`aap_configuration_async_delay`|1|no|This sets the delay between retries for the role globally.| -|`ah_configuration_collection_remote_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| +|`hub_configuration_collection_remote_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| ## Data Structure @@ -89,7 +89,7 @@ This also speeds up the overall role. ```yaml --- -ah_collection_remotes: +hub_collection_remotes: - name: community-infra url: https://beta-galaxy.ansible.com/ requirements: diff --git a/roles/hub_collection_remote/defaults/main.yml b/roles/hub_collection_remote/defaults/main.yml index 2b072fe89..6d28b5716 100644 --- a/roles/hub_collection_remote/defaults/main.yml +++ b/roles/hub_collection_remote/defaults/main.yml @@ -7,10 +7,10 @@ # aap_validate_certs: false # These are the default variables specific to the license role -ah_configuration_collection_remote_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" -ah_configuration_collection_remote_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" -ah_configuration_collection_remote_async_retries: "{{ aap_configuration_async_retries | default(50) }}" -ah_configuration_collection_remote_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" -ah_configuration_collection_remote_async_delay: "{{ aap_configuration_async_delay | default(1) }}" +hub_configuration_collection_remote_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" +hub_configuration_collection_remote_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" +hub_configuration_collection_remote_async_retries: "{{ aap_configuration_async_retries | default(50) }}" +hub_configuration_collection_remote_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" +hub_configuration_collection_remote_async_delay: "{{ aap_configuration_async_delay | default(1) }}" aap_configuration_async_dir: null ... diff --git a/roles/hub_collection_remote/meta/argument_specs.yml b/roles/hub_collection_remote/meta/argument_specs.yml index dc0f40edd..365cebe79 100644 --- a/roles/hub_collection_remote/meta/argument_specs.yml +++ b/roles/hub_collection_remote/meta/argument_specs.yml @@ -3,7 +3,7 @@ argument_specs: main: short_description: An Ansible Role to create collection remotes in Automation Hub. options: - ah_collection_remotes: + hub_collection_remotes: default: [] required: false description: Data structure describing the certified collection remotes to manage. @@ -29,7 +29,7 @@ argument_specs: description: Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`. # No_log variables - ah_configuration_collection_remote_secure_logging: + hub_configuration_collection_remote_secure_logging: default: "{{ aap_configuration_secure_logging | default(false) }}" required: false type: bool diff --git a/roles/hub_collection_remote/tasks/main.yml b/roles/hub_collection_remote/tasks/main.yml index 883657ca9..524485341 100644 --- a/roles/hub_collection_remote/tasks/main.yml +++ b/roles/hub_collection_remote/tasks/main.yml @@ -33,13 +33,13 @@ ah_path_prefix: "{{ ah_path_prefix | default(omit) }}" validate_certs: "{{ aap_validate_certs | default(omit) }}" request_timeout: "{{ aap_request_timeout | default(omit) }}" - loop: "{{ ah_collection_remotes }}" + loop: "{{ hub_collection_remotes }}" loop_control: loop_var: "__hub_collection_remote_item" label: "{{ __operation.verb }} the collection remote {{ __hub_collection_remote_item.name }} in Hub" - pause: "{{ ah_configuration_collection_remote_loop_delay }}" - no_log: "{{ ah_configuration_collection_remote_secure_logging }}" - async: "{{ ah_configuration_collection_remote_async_timeout }}" + pause: "{{ hub_configuration_collection_remote_loop_delay }}" + no_log: "{{ hub_configuration_collection_remote_secure_logging }}" + async: "{{ hub_configuration_collection_remote_async_timeout }}" poll: 0 register: __collection_remote_job_async changed_when: not __collection_remote_job_async.changed @@ -52,14 +52,14 @@ jid: "{{ __collection_remote_job_async_result_item.ansible_job_id }}" register: __collection_remote_job_async_result until: __collection_remote_job_async_result.finished - retries: "{{ ah_configuration_collection_remote_async_retries }}" - delay: "{{ ah_configuration_collection_remote_async_delay }}" + retries: "{{ hub_configuration_collection_remote_async_retries }}" + delay: "{{ hub_configuration_collection_remote_async_delay }}" loop: "{{ __collection_remote_job_async.results }}" loop_control: loop_var: __collection_remote_job_async_result_item label: "{{ __operation.verb }} Collection remote {{ __collection_remote_job_async_result_item.__hub_collection_remote_item.name }} | Wait for finish the Collection remote {{ __operation.action }}" when: __collection_remote_job_async_result_item.ansible_job_id is defined - no_log: "{{ ah_configuration_collection_remote_secure_logging }}" + no_log: "{{ hub_configuration_collection_remote_secure_logging }}" vars: __operation: "{{ operation_translate[__collection_remote_job_async_result_item.state | default(platform_state) | default('present')] }}" ansible_async_dir: '{{ aap_configuration_async_dir }}' diff --git a/roles/hub_collection_remote/tests/vars/repositories.yml b/roles/hub_collection_remote/tests/vars/repositories.yml index 5a0110833..1e51dc48c 100644 --- a/roles/hub_collection_remote/tests/vars/repositories.yml +++ b/roles/hub_collection_remote/tests/vars/repositories.yml @@ -1,5 +1,5 @@ --- -ah_collection_remotes: +hub_collection_remotes: - name: community-infra url: https://beta-galaxy.ansible.com/ requirements: diff --git a/roles/hub_collection_repository/README.md b/roles/hub_collection_repository/README.md index 7dfb97973..92366d5bc 100644 --- a/roles/hub_collection_repository/README.md +++ b/roles/hub_collection_repository/README.md @@ -15,7 +15,7 @@ An Ansible Role to create a Collection Repository. |`aap_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Galaxy or Automation Hub host.|| |`ah_path_prefix`|""|no|API path used to access the api. Either galaxy, automation-hub, or custom|| |`aap_configuration_async_dir`|`null`|no|Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`.|| -|`ah_collection_repositories`|`see below`|yes|Data structure describing your collection remote repository, described below.|| +|`hub_collection_repositories`|`see below`|yes|Data structure describing your collection remote repository, described below.|| The `aap_configuration_async_dir` variable sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`. @@ -25,11 +25,11 @@ The default value is set to `null` which uses the Ansible Default of `/root/.an The following Variables compliment each other. If Both variables are not set, secure logging defaults to false. The role defaults to False as normally the add repository task does not include sensitive information. -ah_configuration_repository_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. +hub_configuration_repository_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| -|`ah_configuration_collection_repository_secure_logging`|`False`|no|Whether or not to include the sensitive Namespace role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| +|`hub_configuration_collection_repository_secure_logging`|`False`|no|Whether or not to include the sensitive Namespace role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| |`aap_configuration_secure_logging`|`False`|no|This variable enables secure logging as well, but is shared across multiple roles, see above.| ### Asynchronous Retry Variables @@ -42,13 +42,13 @@ This also speeds up the overall role. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| |`aap_configuration_async_timeout`|1000|no|This variable sets the async timeout for the role globally.| -|`ah_configuration_collection_repository_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| +|`hub_configuration_collection_repository_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| |`aap_configuration_async_retries`|50|no|This variable sets the number of retries to attempt for the role globally.| -|`ah_configuration_collection_repository_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| +|`hub_configuration_collection_repository_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| |`aap_configuration_loop_delay`|1000|no|This variable sets the loop_delay for the role globally.| -|`ah_configuration_collection_repository_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| +|`hub_configuration_collection_repository_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| |`aap_configuration_async_delay`|1|no|This sets the delay between retries for the role globally.| -|`ah_configuration_collection_repository_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| +|`hub_configuration_collection_repository_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| ## Data Structure @@ -94,7 +94,7 @@ distribution: ```yaml --- -ah_collection_repositories: +hub_collection_repositories: - name: "foobar" description: "description of foobar repository" pulp_labels: diff --git a/roles/hub_collection_repository/defaults/main.yml b/roles/hub_collection_repository/defaults/main.yml index 3fc781eaa..567b98714 100644 --- a/roles/hub_collection_repository/defaults/main.yml +++ b/roles/hub_collection_repository/defaults/main.yml @@ -7,10 +7,10 @@ # aap_validate_certs: false # These are the default variables specific to the license role -ah_configuration_collection_repository_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" -ah_configuration_collection_repository_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" -ah_configuration_collection_repository_async_retries: "{{ aap_configuration_async_retries | default(50) }}" -ah_configuration_collection_repository_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" -ah_configuration_collection_repository_async_delay: "{{ aap_configuration_async_delay | default(1) }}" +hub_configuration_collection_repository_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" +hub_configuration_collection_repository_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" +hub_configuration_collection_repository_async_retries: "{{ aap_configuration_async_retries | default(50) }}" +hub_configuration_collection_repository_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" +hub_configuration_collection_repository_async_delay: "{{ aap_configuration_async_delay | default(1) }}" aap_configuration_async_dir: null ... diff --git a/roles/hub_collection_repository/meta/argument_specs.yml b/roles/hub_collection_repository/meta/argument_specs.yml index e30c33441..4e1ff673d 100644 --- a/roles/hub_collection_repository/meta/argument_specs.yml +++ b/roles/hub_collection_repository/meta/argument_specs.yml @@ -3,7 +3,7 @@ argument_specs: main: short_description: An Ansible Role to create collection remotes in Automation Hub. options: - ah_collection_repositories: + hub_collection_repositories: default: [] required: false description: Data structure describing the certified collection remotes to manage. @@ -17,7 +17,7 @@ argument_specs: description: Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`. # No_log variables - ah_configuration_collection_repository_secure_logging: + hub_configuration_collection_repository_secure_logging: default: "{{ aap_configuration_secure_logging | default(false) }}" required: false type: bool diff --git a/roles/hub_collection_repository/tasks/main.yml b/roles/hub_collection_repository/tasks/main.yml index d001a5b36..155f0cd2c 100644 --- a/roles/hub_collection_repository/tasks/main.yml +++ b/roles/hub_collection_repository/tasks/main.yml @@ -20,13 +20,13 @@ ah_path_prefix: "{{ ah_path_prefix | default(omit) }}" validate_certs: "{{ aap_validate_certs | default(omit) }}" request_timeout: "{{ aap_request_timeout | default(omit) }}" - loop: "{{ ah_collection_repositories }}" + loop: "{{ hub_collection_repositories }}" loop_control: loop_var: __hub_collection_repository_item label: "{{ __operation.verb }} the remote repository {{ __hub_collection_repository_item.name }} in Hub" - pause: "{{ ah_configuration_collection_repository_loop_delay }}" - no_log: "{{ ah_configuration_collection_repository_secure_logging }}" - async: "{{ ah_configuration_collection_repository_async_timeout }}" + pause: "{{ hub_configuration_collection_repository_loop_delay }}" + no_log: "{{ hub_configuration_collection_repository_secure_logging }}" + async: "{{ hub_configuration_collection_repository_async_timeout }}" poll: 0 register: __collection_repository_job_async changed_when: not __collection_repository_job_async.changed @@ -39,14 +39,14 @@ jid: "{{ __collection_repository_job_async_result_item.ansible_job_id }}" register: __collection_repository_job_async_result until: __collection_repository_job_async_result.finished - retries: "{{ ah_configuration_collection_repository_async_retries }}" - delay: "{{ ah_configuration_collection_repository_async_delay }}" + retries: "{{ hub_configuration_collection_repository_async_retries }}" + delay: "{{ hub_configuration_collection_repository_async_delay }}" loop: "{{ __collection_repository_job_async.results }}" loop_control: loop_var: __collection_repository_job_async_result_item label: "{{ __operation.verb }} Collection repository {{ __collection_repository_job_async_result_item.__hub_collection_repository_item.name }} | Wait for finish the Collection repository {{ __operation.action }}" when: __collection_repository_job_async_result_item.ansible_job_id is defined - no_log: "{{ ah_configuration_collection_repository_secure_logging }}" + no_log: "{{ hub_configuration_collection_repository_secure_logging }}" vars: __operation: "{{ operation_translate[__collection_repository_job_async_result_item.state | default(platform_state) | default('present')] }}" ansible_async_dir: '{{ aap_configuration_async_dir }}' diff --git a/roles/hub_collection_repository/tests/vars/repositories.yml b/roles/hub_collection_repository/tests/vars/repositories.yml index 173b89571..a7a4992e2 100644 --- a/roles/hub_collection_repository/tests/vars/repositories.yml +++ b/roles/hub_collection_repository/tests/vars/repositories.yml @@ -1,5 +1,5 @@ --- -ah_collection_repositories: +hub_collection_repositories: - name: "foobar" description: "description of foobar repository" pulp_labels: diff --git a/roles/hub_collection_repository_sync/README.md b/roles/hub_collection_repository_sync/README.md index 5868a4508..53fde4a8b 100644 --- a/roles/hub_collection_repository_sync/README.md +++ b/roles/hub_collection_repository_sync/README.md @@ -15,7 +15,7 @@ An Ansible Role to sync a Collection Repository. |`aap_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Galaxy or Automation Hub host.|| |`ah_path_prefix`|""|no|API path used to access the api. Either galaxy, automation-hub, or custom|| |`aap_configuration_async_dir`|`null`|no|Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`.|| -|`ah_collection_repositories`|`see below`|yes|Data structure describing your collection remote repository, described below.|| +|`hub_collection_repositories`|`see below`|yes|Data structure describing your collection remote repository, described below.|| The `aap_configuration_async_dir` variable sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`. @@ -25,11 +25,11 @@ The default value is set to `null` which uses the Ansible Default of `/root/.an The following Variables compliment each other. If Both variables are not set, secure logging defaults to false. The role defaults to False as normally the add repository task does not include sensitive information. -ah_configuration_repository_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. +hub_configuration_repository_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| -|`ah_configuration_collection_repository_sync_secure_logging`|`False`|no|Whether or not to include the sensitive Namespace role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| +|`hub_configuration_collection_repository_sync_secure_logging`|`False`|no|Whether or not to include the sensitive Namespace role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| |`aap_configuration_secure_logging`|`False`|no|This variable enables secure logging as well, but is shared across multiple roles, see above.| ### Asynchronous Retry Variables @@ -42,13 +42,13 @@ This also speeds up the overall role. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| |`aap_configuration_async_timeout`|1000|no|This variable sets the async timeout for the role globally.| -|`ah_configuration_collection_repository_sync_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| +|`hub_configuration_collection_repository_sync_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| |`aap_configuration_async_retries`|50|no|This variable sets the number of retries to attempt for the role globally.| -|`ah_configuration_collection_repository_sync_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| +|`hub_configuration_collection_repository_sync_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| |`aap_configuration_loop_delay`|1000|no|This variable sets the loop_delay for the role globally.| -|`ah_configuration_collection_repository_sync_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| +|`hub_configuration_collection_repository_sync_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| |`aap_configuration_async_delay`|1|no|This sets the delay between retries for the role globally.| -|`ah_configuration_collection_repository_sync_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| +|`hub_configuration_collection_repository_sync_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| ## Data Structure @@ -68,7 +68,7 @@ This also speeds up the overall role. ```yaml --- -ah_collection_repositories: +hub_collection_repositories: - name: rh-certified wait: false - name: community diff --git a/roles/hub_collection_repository_sync/defaults/main.yml b/roles/hub_collection_repository_sync/defaults/main.yml index f2173fbb1..2462a3232 100644 --- a/roles/hub_collection_repository_sync/defaults/main.yml +++ b/roles/hub_collection_repository_sync/defaults/main.yml @@ -7,10 +7,10 @@ # aap_validate_certs: false # These are the default variables specific to the license role -ah_configuration_collection_repository_sync_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" -ah_configuration_collection_repository_sync_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" -ah_configuration_collection_repository_sync_async_retries: "{{ aap_configuration_async_retries | default(50) }}" -ah_configuration_collection_repository_sync_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" -ah_configuration_collection_repository_sync_async_delay: "{{ aap_configuration_async_delay | default(1) }}" +hub_configuration_collection_repository_sync_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" +hub_configuration_collection_repository_sync_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" +hub_configuration_collection_repository_sync_async_retries: "{{ aap_configuration_async_retries | default(50) }}" +hub_configuration_collection_repository_sync_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" +hub_configuration_collection_repository_sync_async_delay: "{{ aap_configuration_async_delay | default(1) }}" aap_configuration_async_dir: null ... diff --git a/roles/hub_collection_repository_sync/meta/argument_specs.yml b/roles/hub_collection_repository_sync/meta/argument_specs.yml index e30c33441..4e1ff673d 100644 --- a/roles/hub_collection_repository_sync/meta/argument_specs.yml +++ b/roles/hub_collection_repository_sync/meta/argument_specs.yml @@ -3,7 +3,7 @@ argument_specs: main: short_description: An Ansible Role to create collection remotes in Automation Hub. options: - ah_collection_repositories: + hub_collection_repositories: default: [] required: false description: Data structure describing the certified collection remotes to manage. @@ -17,7 +17,7 @@ argument_specs: description: Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`. # No_log variables - ah_configuration_collection_repository_secure_logging: + hub_configuration_collection_repository_secure_logging: default: "{{ aap_configuration_secure_logging | default(false) }}" required: false type: bool diff --git a/roles/hub_collection_repository_sync/tasks/main.yml b/roles/hub_collection_repository_sync/tasks/main.yml index ab325b4bc..da2773783 100644 --- a/roles/hub_collection_repository_sync/tasks/main.yml +++ b/roles/hub_collection_repository_sync/tasks/main.yml @@ -12,13 +12,13 @@ ah_path_prefix: "{{ ah_path_prefix | default(omit) }}" validate_certs: "{{ aap_validate_certs | default(omit) }}" request_timeout: "{{ aap_request_timeout | default(omit) }}" - loop: "{{ ah_collection_repositories }}" + loop: "{{ hub_collection_repositories }}" loop_control: loop_var: __hub_collection_repository_sync_item label: "{{ __operation.verb }} the sync {{ __hub_collection_repository_sync_item.name }} in Hub" - pause: "{{ ah_configuration_collection_repository_sync_loop_delay }}" - no_log: "{{ ah_configuration_collection_repository_sync_secure_logging }}" - async: "{{ ah_configuration_collection_repository_sync_async_timeout }}" + pause: "{{ hub_configuration_collection_repository_sync_loop_delay }}" + no_log: "{{ hub_configuration_collection_repository_sync_secure_logging }}" + async: "{{ hub_configuration_collection_repository_sync_async_timeout }}" poll: 0 register: __collection_repository_sync_job_async changed_when: not __collection_repository_sync_job_async.changed @@ -31,14 +31,14 @@ jid: "{{ __collection_repository_sync_job_async_result_item.ansible_job_id }}" register: __collection_repository_sync_job_async_result until: __collection_repository_sync_job_async_result.finished - retries: "{{ ah_configuration_collection_repository_sync_async_retries }}" - delay: "{{ ah_configuration_collection_repository_sync_async_delay }}" + retries: "{{ hub_configuration_collection_repository_sync_async_retries }}" + delay: "{{ hub_configuration_collection_repository_sync_async_delay }}" loop: "{{ __collection_repository_sync_job_async.results }}" loop_control: loop_var: __collection_repository_sync_job_async_result_item label: "{{ __operation.verb }} Collection repository sync {{ __collection_repository_sync_job_async_result_item.__hub_collection_repository_sync_item.name }} | Wait for finish the Label {{ __operation.action }}" when: __collection_repository_sync_job_async_result_item.ansible_job_id is defined - no_log: "{{ ah_configuration_collection_repository_sync_secure_logging }}" + no_log: "{{ hub_configuration_collection_repository_sync_secure_logging }}" vars: __operation: "{{ operation_translate[__collection_repository_sync_job_async_result_item.state | default(platform_state) | default('present')] }}" ansible_async_dir: '{{ aap_configuration_async_dir }}' diff --git a/roles/hub_collection_repository_sync/tests/vars/repositories.yml b/roles/hub_collection_repository_sync/tests/vars/repositories.yml index 173b89571..a7a4992e2 100644 --- a/roles/hub_collection_repository_sync/tests/vars/repositories.yml +++ b/roles/hub_collection_repository_sync/tests/vars/repositories.yml @@ -1,5 +1,5 @@ --- -ah_collection_repositories: +hub_collection_repositories: - name: "foobar" description: "description of foobar repository" pulp_labels: diff --git a/roles/hub_ee_image/README.md b/roles/hub_ee_image/README.md index 3988665e6..dcc813cb8 100644 --- a/roles/hub_ee_image/README.md +++ b/roles/hub_ee_image/README.md @@ -15,18 +15,18 @@ An Ansible Role to create execution environment images in Automation Hub. |`aap_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Galaxy or Automation Hub host.|| |`ah_path_prefix`|""|no|API path used to access the api. Either galaxy, automation-hub, or custom|| |`aap_configuration_async_dir`|`null`|no|Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`.|| -|`ah_ee_images`|`see below`|yes|Data structure describing your execution environment images, described below.|| +|`hub_ee_images`|`see below`|yes|Data structure describing your execution environment images, described below.|| ### Secure Logging Variables The following Variables compliment each other. If Both variables are not set, secure logging defaults to false. The role defaults to False as normally the add ee_image task does not include sensitive information. -ah_configuration_ee_image_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. +hub_configuration_ee_image_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| -|`ah_configuration_ee_image_secure_logging`|`False`|no|Whether or not to include the sensitive Namespace role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| +|`hub_configuration_ee_image_secure_logging`|`False`|no|Whether or not to include the sensitive Namespace role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| |`aap_configuration_secure_logging`|`False`|no|This variable enables secure logging as well, but is shared across multiple roles, see above.| ### Asynchronous Retry Variables @@ -39,13 +39,13 @@ This also speeds up the overall role. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| |`aap_configuration_async_timeout`|1000|no|This variable sets the async timeout for the role globally.| -|`ah_configuration_ee_image_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| +|`hub_configuration_ee_image_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| |`aap_configuration_async_retries`|50|no|This variable sets the number of retries to attempt for the role globally.| -|`ah_configuration_ee_image_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| +|`hub_configuration_ee_image_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| |`aap_configuration_loop_delay`|1000|no|This variable sets the loop_delay for the role globally.| -|`ah_configuration_ee_image_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| +|`hub_configuration_ee_image_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| |`aap_configuration_async_delay`|1|no|This sets the delay between retries for the role globally.| -|`ah_configuration_ee_image_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| +|`hub_configuration_ee_image_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| ## Data Structure @@ -64,7 +64,7 @@ This also speeds up the overall role. ```yaml --- -ah_ee_images: +hub_ee_images: - name: ansible-automation-platform-20-early-access/ee-supported-rhel8:2.0.0-15 state: present append: false diff --git a/roles/hub_ee_image/defaults/main.yml b/roles/hub_ee_image/defaults/main.yml index fd863dd6f..d5c304802 100644 --- a/roles/hub_ee_image/defaults/main.yml +++ b/roles/hub_ee_image/defaults/main.yml @@ -9,7 +9,7 @@ # These are the default variables specific to the license role # a list of dictionaries describing the Automation Hub execution environment image -ah_ee_images: [] +hub_ee_images: [] # possible fields: # - name: name: ansible-automation-platform-20-early-access/ee-supported-rhel8:2.0.0-15 # state: present @@ -19,10 +19,10 @@ ah_ee_images: [] # - "2.0" # - prod1 -ah_configuration_ee_image_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" -ah_configuration_ee_image_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" -ah_configuration_ee_image_async_retries: "{{ aap_configuration_async_retries | default(50) }}" -ah_configuration_ee_image_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" -ah_configuration_ee_image_async_delay: "{{ aap_configuration_async_delay | default(1) }}" +hub_configuration_ee_image_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" +hub_configuration_ee_image_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" +hub_configuration_ee_image_async_retries: "{{ aap_configuration_async_retries | default(50) }}" +hub_configuration_ee_image_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" +hub_configuration_ee_image_async_delay: "{{ aap_configuration_async_delay | default(1) }}" aap_configuration_async_dir: null ... diff --git a/roles/hub_ee_image/meta/argument_specs.yml b/roles/hub_ee_image/meta/argument_specs.yml index 96edb0b64..02b4f74ae 100644 --- a/roles/hub_ee_image/meta/argument_specs.yml +++ b/roles/hub_ee_image/meta/argument_specs.yml @@ -3,7 +3,7 @@ argument_specs: main: short_description: An Ansible Role to create execution environment images in Automation Hub. options: - ah_ee_images: + hub_ee_images: default: [] required: false description: Data structure describing your ee images to manage. @@ -11,7 +11,7 @@ argument_specs: elements: dict # Async variables - ah_configuration_ee_image_async_retries: + hub_configuration_ee_image_async_retries: default: "{{ aap_configuration_async_retries | default(50) }}" required: false description: This variable sets the number of retries to attempt for the role. @@ -19,7 +19,7 @@ argument_specs: default: 50 required: false description: This variable sets number of retries across all roles as a default. - ah_configuration_ee_image_async_delay: + hub_configuration_ee_image_async_delay: default: "{{ aap_configuration_async_delay | default(1) }}" required: false description: This variable sets delay between retries for the role. @@ -33,7 +33,7 @@ argument_specs: description: Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`. # No_log variables - ah_configuration_ee_image_secure_logging: + hub_configuration_ee_image_secure_logging: default: "{{ aap_configuration_secure_logging | default(false) }}" required: false type: bool diff --git a/roles/hub_ee_image/tasks/main.yml b/roles/hub_ee_image/tasks/main.yml index 4f603b111..6a475adfc 100644 --- a/roles/hub_ee_image/tasks/main.yml +++ b/roles/hub_ee_image/tasks/main.yml @@ -14,13 +14,13 @@ ah_path_prefix: "{{ ah_path_prefix | default(omit) }}" validate_certs: "{{ aap_validate_certs | default(omit) }}" request_timeout: "{{ aap_request_timeout | default(omit) }}" - loop: "{{ ah_ee_images }}" + loop: "{{ hub_ee_images }}" loop_control: loop_var: __ee_image_item label: "{{ __operation.verb }} the EE image {{ __ee_image_item.name }} in Hub" - pause: "{{ ah_configuration_ee_image_loop_delay }}" - no_log: "{{ ah_configuration_ee_image_secure_logging }}" - async: "{{ ah_configuration_ee_image_async_timeout }}" + pause: "{{ hub_configuration_ee_image_loop_delay }}" + no_log: "{{ hub_configuration_ee_image_secure_logging }}" + async: "{{ hub_configuration_ee_image_async_timeout }}" poll: 0 register: __ee_images_job_async changed_when: not __ee_images_job_async.changed @@ -33,14 +33,14 @@ jid: "{{ __ee_images_job_async_result_item.ansible_job_id }}" register: __ee_images_job_async_result until: __ee_images_job_async_result.finished - retries: "{{ ah_configuration_ee_image_async_retries }}" - delay: "{{ ah_configuration_ee_image_async_delay }}" + retries: "{{ hub_configuration_ee_image_async_retries }}" + delay: "{{ hub_configuration_ee_image_async_delay }}" loop: "{{ __ee_images_job_async.results }}" loop_control: loop_var: __ee_images_job_async_result_item label: "{{ __operation.verb }} Label {{ __ee_images_job_async_result_item.__ee_image_item.name }} | Wait for finish the Label {{ __operation.action }}" when: __ee_images_job_async_result_item.ansible_job_id is defined - no_log: "{{ ah_configuration_ee_image_secure_logging }}" + no_log: "{{ hub_configuration_ee_image_secure_logging }}" vars: __operation: "{{ operation_translate[__ee_images_job_async_result_item.state | default(platform_state) | default('present')] }}" ansible_async_dir: '{{ aap_configuration_async_dir }}' diff --git a/roles/hub_ee_image/tests/vars/ee_images.yml b/roles/hub_ee_image/tests/vars/ee_images.yml index c70a9a878..bd7fa3c9f 100644 --- a/roles/hub_ee_image/tests/vars/ee_images.yml +++ b/roles/hub_ee_image/tests/vars/ee_images.yml @@ -1,5 +1,5 @@ --- -ah_ee_images: +hub_ee_images: - name: ansible-automation-platform-20-early-access/ee-supported-rhel8:2.0.0-15 state: present append: false diff --git a/roles/hub_ee_registry/README.md b/roles/hub_ee_registry/README.md index d02a58886..e67d2f95c 100644 --- a/roles/hub_ee_registry/README.md +++ b/roles/hub_ee_registry/README.md @@ -18,18 +18,18 @@ An Ansible Role to create EE Registries in Automation Hub. |`proxy_url`|""|no|str|The URL for the proxy. Defaults to global `proxy_url` variable.| |`proxy_username`|""|no|str|The username for the proxy authentication. Defaults to global `proxy_username` variable.| |`proxy_password`|""|no|str|The password for the proxy authentication. Defaults to global `proxy_password` variable.| -|`ah_ee_registries`|`see below`|yes|Data structure describing your ee_registries, described below.|| +|`hub_ee_registries`|`see below`|yes|Data structure describing your ee_registries, described below.|| ### Secure Logging Variables The following Variables compliment each other. If Both variables are not set, secure logging defaults to false. The role defaults to False as normally the add ee_registry task does not include sensitive information. -ah_configuration_ee_registry_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. +hub_configuration_ee_registry_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| -|`ah_configuration_ee_registry_secure_logging`|`False`|no|Whether or not to include the sensitive Registry role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| +|`hub_configuration_ee_registry_secure_logging`|`False`|no|Whether or not to include the sensitive Registry role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| |`aap_configuration_secure_logging`|`False`|no|This variable enables secure logging as well, but is shared across multiple roles, see above.| ### Asynchronous Retry Variables @@ -42,13 +42,13 @@ This also speeds up the overall role. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| |`aap_configuration_async_timeout`|1000|no|This variable sets the async timeout for the role globally.| -|`ah_configuration_ee_registry_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| +|`hub_configuration_ee_registry_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| |`aap_configuration_async_retries`|50|no|This variable sets the number of retries to attempt for the role globally.| -|`ah_configuration_ee_registry_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| +|`hub_configuration_ee_registry_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| |`aap_configuration_loop_delay`|1000|no|This variable sets the loop_delay for the role globally.| -|`ah_configuration_ee_registry_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| +|`hub_configuration_ee_registry_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| |`aap_configuration_async_delay`|1|no|This sets the delay between retries for the role globally.| -|`ah_configuration_ee_registry_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| +|`hub_configuration_ee_registry_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| ## Data Structure @@ -72,7 +72,7 @@ This also speeds up the overall role. ```yaml --- -ah_ee_registries: +hub_ee_registries: - name: myreg url: https://quay.io/my/registry ``` diff --git a/roles/hub_ee_registry/defaults/main.yml b/roles/hub_ee_registry/defaults/main.yml index d56767f90..b6e47d23c 100644 --- a/roles/hub_ee_registry/defaults/main.yml +++ b/roles/hub_ee_registry/defaults/main.yml @@ -9,7 +9,7 @@ # These are the default variables specific to the license role # a list of dictionaries describing the Automation Hub ee repository -ah_ee_registries: [] +hub_ee_registries: [] # possible fields: # - name: "registry" # mandatory # url: registry.redhat.io # mandatory @@ -23,10 +23,10 @@ ah_ee_registries: [] # rate_limit: 5 # state: present -ah_configuration_ee_registry_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" -ah_configuration_ee_registry_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" -ah_configuration_ee_registry_async_retries: "{{ aap_configuration_async_retries | default(50) }}" -ah_configuration_ee_registry_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" -ah_configuration_ee_registry_async_delay: "{{ aap_configuration_async_delay | default(1) }}" +hub_configuration_ee_registry_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" +hub_configuration_ee_registry_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" +hub_configuration_ee_registry_async_retries: "{{ aap_configuration_async_retries | default(50) }}" +hub_configuration_ee_registry_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" +hub_configuration_ee_registry_async_delay: "{{ aap_configuration_async_delay | default(1) }}" aap_configuration_async_dir: null ... diff --git a/roles/hub_ee_registry/meta/argument_specs.yml b/roles/hub_ee_registry/meta/argument_specs.yml index b7c5cba6a..8e2eb1d74 100644 --- a/roles/hub_ee_registry/meta/argument_specs.yml +++ b/roles/hub_ee_registry/meta/argument_specs.yml @@ -3,7 +3,7 @@ argument_specs: main: short_description: An Ansible Role to create execution environment registry in Automation Hub. options: - ah_ee_registries: + hub_ee_registries: default: [] required: false description: Data structure describing your ee registries to manage. @@ -23,7 +23,7 @@ argument_specs: description: Information regarding the proxy that AH will use to communicate to the Red Hat repositories. Can be left empty if no proxy used. # Async variables - ah_configuration_ee_registry_async_retries: + hub_configuration_ee_registry_async_retries: default: "{{ aap_configuration_async_retries | default(50) }}" required: false description: This variable sets the number of retries to attempt for the role. @@ -31,7 +31,7 @@ argument_specs: default: 50 required: false description: This variable sets number of retries across all roles as a default. - ah_configuration_ee_registry_async_delay: + hub_configuration_ee_registry_async_delay: default: "{{ aap_configuration_async_delay | default(1) }}" required: false description: This variable sets delay between retries for the role. @@ -45,7 +45,7 @@ argument_specs: description: Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`. # No_log variables - ah_configuration_ee_registry_secure_logging: + hub_configuration_ee_registry_secure_logging: default: "{{ aap_configuration_secure_logging | default(false) }}" required: false type: bool diff --git a/roles/hub_ee_registry/tasks/main.yml b/roles/hub_ee_registry/tasks/main.yml index 3cccad431..7ba15e813 100644 --- a/roles/hub_ee_registry/tasks/main.yml +++ b/roles/hub_ee_registry/tasks/main.yml @@ -20,13 +20,13 @@ proxy_url: "{{ __hub_ee_registry_item.proxy_url | default(proxy_url | default(omit)) }}" proxy_username: "{{ __hub_ee_registry_item.proxy_username | default(proxy_username | default(omit)) }}" proxy_password: "{{ __hub_ee_registry_item.proxy_password | default(proxy_password | default(omit)) }}" - loop: "{{ ah_ee_registries }}" + loop: "{{ hub_ee_registries }}" loop_control: loop_var: __hub_ee_registry_item label: "{{ __operation.verb }} the EE registry {{ __hub_ee_registry_item.name }} in Hub" - pause: "{{ ah_configuration_ee_registry_loop_delay }}" - no_log: "{{ ah_configuration_ee_registry_secure_logging }}" - async: "{{ ah_configuration_ee_registry_async_timeout }}" + pause: "{{ hub_configuration_ee_registry_loop_delay }}" + no_log: "{{ hub_configuration_ee_registry_secure_logging }}" + async: "{{ hub_configuration_ee_registry_async_timeout }}" poll: 0 register: __ee_registries_job_async changed_when: not __ee_registries_job_async.changed @@ -39,14 +39,14 @@ jid: "{{ __ee_registries_job_async_result_item.ansible_job_id }}" register: __ee_registries_job_async_result until: __ee_registries_job_async_result.finished - retries: "{{ ah_configuration_ee_registry_async_retries }}" - delay: "{{ ah_configuration_ee_registry_async_delay }}" + retries: "{{ hub_configuration_ee_registry_async_retries }}" + delay: "{{ hub_configuration_ee_registry_async_delay }}" loop: "{{ __ee_registries_job_async.results }}" loop_control: loop_var: __ee_registries_job_async_result_item label: "{{ __operation.verb }} Label {{ __ee_registries_job_async_result_item.__hub_ee_registry_item.name }} | Wait for finish the Label {{ __operation.action }}" when: __ee_registries_job_async_result_item.ansible_job_id is defined - no_log: "{{ ah_configuration_ee_registry_secure_logging }}" + no_log: "{{ hub_configuration_ee_registry_secure_logging }}" vars: __operation: "{{ operation_translate[__ee_registries_job_async_result_item.state | default(platform_state) | default('present')] }}" ansible_async_dir: '{{ aap_configuration_async_dir }}' diff --git a/roles/hub_ee_registry/tests/vars/ee_registries.yml b/roles/hub_ee_registry/tests/vars/ee_registries.yml index 1ca54dd40..2b2ed5d1c 100644 --- a/roles/hub_ee_registry/tests/vars/ee_registries.yml +++ b/roles/hub_ee_registry/tests/vars/ee_registries.yml @@ -1,5 +1,5 @@ --- -ah_ee_registries: +hub_ee_registries: - name: registry.redhat url: registry.redhat.io username: myuser diff --git a/roles/hub_ee_registry_index/README.md b/roles/hub_ee_registry_index/README.md index bd77f6cc2..f823b408a 100644 --- a/roles/hub_ee_registry_index/README.md +++ b/roles/hub_ee_registry_index/README.md @@ -15,18 +15,18 @@ An Ansible Role to index EE Registries in Automation Hub. |`aap_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Galaxy or Automation Hub host.|| |`ah_path_prefix`|""|no|API path used to access the api. Either galaxy, automation-hub, or custom|| |`aap_configuration_async_dir`|`null`|no|Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`.|| -|`ah_ee_registries`|`see below`|yes|Data structure describing your ee_registries, described below. (Note this is the same as for the `ee_registries` role and the variable can be combined). Note that this role will only do anything if the `index` suboption of this variable is set to true.|| +|`hub_ee_registries`|`see below`|yes|Data structure describing your ee_registries, described below. (Note this is the same as for the `ee_registries` role and the variable can be combined). Note that this role will only do anything if the `index` suboption of this variable is set to true.|| ### Secure Logging Variables The following Variables compliment each other. If Both variables are not set, secure logging defaults to false. The role defaults to False as normally the add ee_registry task does not include sensitive information. -ah_configuration_ee_registry_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. +hub_configuration_ee_registry_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| -|`ah_configuration_ee_registry_secure_logging`|`False`|no|Whether or not to include the sensitive Registry role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| +|`hub_configuration_ee_registry_secure_logging`|`False`|no|Whether or not to include the sensitive Registry role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| |`aap_configuration_secure_logging`|`False`|no|This variable enables secure logging as well, but is shared across multiple roles, see above.| ### Asynchronous Retry Variables @@ -39,13 +39,13 @@ This also speeds up the overall role. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| |`aap_configuration_async_timeout`|1000|no|This variable sets the async timeout for the role globally.| -|`ah_configuration_ee_registry_index_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| +|`hub_configuration_ee_registry_index_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| |`aap_configuration_async_retries`|50|no|This variable sets the number of retries to attempt for the role globally.| -|`ah_configuration_ee_registry_index_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| +|`hub_configuration_ee_registry_index_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| |`aap_configuration_loop_delay`|1000|no|This variable sets the loop_delay for the role globally.| -|`ah_configuration_ee_registry_index_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| +|`hub_configuration_ee_registry_index_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| |`aap_configuration_async_delay`|1|no|This sets the delay between retries for the role globally.| -|`ah_configuration_ee_registry_index_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| +|`hub_configuration_ee_registry_index_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| ## Data Structure @@ -56,7 +56,7 @@ This also speeds up the overall role. |`name`|""|yes|str|Registry name. Must be lower case containing only alphanumeric characters and underscores.| |`index`|false|no|bool|Whether to index the ee_registry. Bu default it will not index unless this is set to true.| |`wait`|true|no|str|Whether to wait for the indexing to complete| -|`interval`|`ah_configuration_ee_registry_index_async_delay`|no|str|The interval which the indexing task will be checked for completion| +|`interval`|`hub_configuration_ee_registry_index_async_delay`|no|str|The interval which the indexing task will be checked for completion| |`timeout`|""|no|str|How long to wait for the indexing task to complete| ### Standard Project Data Structure @@ -65,7 +65,7 @@ This also speeds up the overall role. ```yaml --- -ah_ee_registries: +hub_ee_registries: - name: myreg url: https://quay.io/my/registry interval: 10 diff --git a/roles/hub_ee_registry_index/defaults/main.yml b/roles/hub_ee_registry_index/defaults/main.yml index 076d41407..78edd96c8 100644 --- a/roles/hub_ee_registry_index/defaults/main.yml +++ b/roles/hub_ee_registry_index/defaults/main.yml @@ -9,17 +9,17 @@ # These are the default variables specific to the license role # a list of dictionaries describing the Automation Hub ee repository -ah_ee_registries: [] +hub_ee_registries: [] # possible fields: # - name: "registry_name" # mandatory # interval: 1 # wait: true # timeout: -ah_configuration_ee_registry_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" -ah_configuration_ee_registry_index_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" -ah_configuration_ee_registry_index_async_retries: "{{ aap_configuration_async_retries | default(50) }}" -ah_configuration_ee_registry_index_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" -ah_configuration_ee_registry_index_async_delay: "{{ aap_configuration_async_delay | default(1) }}" +hub_configuration_ee_registry_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" +hub_configuration_ee_registry_index_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" +hub_configuration_ee_registry_index_async_retries: "{{ aap_configuration_async_retries | default(50) }}" +hub_configuration_ee_registry_index_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" +hub_configuration_ee_registry_index_async_delay: "{{ aap_configuration_async_delay | default(1) }}" aap_configuration_async_dir: null ... diff --git a/roles/hub_ee_registry_index/meta/argument_specs.yml b/roles/hub_ee_registry_index/meta/argument_specs.yml index 3913368b3..2755c2d2f 100644 --- a/roles/hub_ee_registry_index/meta/argument_specs.yml +++ b/roles/hub_ee_registry_index/meta/argument_specs.yml @@ -3,7 +3,7 @@ argument_specs: main: short_description: An Ansible Role to index execution environment registries in Automation Hub. options: - ah_ee_registries: + hub_ee_registries: default: [] required: false description: Data structure describing your ee registries to manage. If the index option is set then the registry will be indexed @@ -11,7 +11,7 @@ argument_specs: elements: dict # Async variables - ah_configuration_ee_registry_index_async_retries: + hub_configuration_ee_registry_index_async_retries: default: "{{ aap_configuration_async_retries | default(50) }}" required: false description: This variable sets the number of retries to attempt for the role. @@ -19,7 +19,7 @@ argument_specs: default: 50 required: false description: This variable sets number of retries across all roles as a default. - ah_configuration_ee_registry_index_async_delay: + hub_configuration_ee_registry_index_async_delay: default: "{{ aap_configuration_async_delay | default(1) }}" required: false description: This variable sets delay between retries for the role. @@ -33,7 +33,7 @@ argument_specs: description: Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`. # No_log variables - ah_configuration_ee_registry_secure_logging: + hub_configuration_ee_registry_secure_logging: default: "{{ aap_configuration_secure_logging | default(false) }}" required: false type: bool diff --git a/roles/hub_ee_registry_index/tasks/main.yml b/roles/hub_ee_registry_index/tasks/main.yml index ea577881b..aa6e5bc02 100644 --- a/roles/hub_ee_registry_index/tasks/main.yml +++ b/roles/hub_ee_registry_index/tasks/main.yml @@ -5,7 +5,7 @@ ansible.hub.ah_ee_registry_index: name: "{{ __hub_ee_registry_index_item.name }}" wait: "{{ __hub_ee_registry_index_item.wait | default(omit) }}" - interval: "{{ __hub_ee_registry_index_item.interval | default(ah_configuration_ee_registry_index_async_delay) }}" + interval: "{{ __hub_ee_registry_index_item.interval | default(hub_configuration_ee_registry_index_async_delay) }}" timeout: "{{ __hub_ee_registry_index_item.timeout | default(omit) }}" ah_host: "{{ aap_hostname | default(omit) }}" ah_username: "{{ aap_username | default(omit) }}" @@ -13,14 +13,14 @@ ah_path_prefix: "{{ ah_path_prefix | default(omit) }}" validate_certs: "{{ aap_validate_certs | default(omit) }}" request_timeout: "{{ aap_request_timeout | default(omit) }}" - loop: "{{ ah_ee_registries }}" + loop: "{{ hub_ee_registries }}" loop_control: loop_var: __hub_ee_registry_index_item label: "{{ __operation.verb }} the EE registry index {{ __hub_ee_registry_index_item.name }} in Hub" - pause: "{{ ah_configuration_ee_registry_index_loop_delay }}" + pause: "{{ hub_configuration_ee_registry_index_loop_delay }}" when: __hub_ee_registry_index_item.index | default(false) - no_log: "{{ ah_configuration_ee_registry_secure_logging }}" - async: "{{ ah_configuration_ee_registry_index_async_timeout }}" + no_log: "{{ hub_configuration_ee_registry_secure_logging }}" + async: "{{ hub_configuration_ee_registry_index_async_timeout }}" poll: 0 register: __ee_registry_indexes_job_async changed_when: not __ee_registry_indexes_job_async.changed @@ -33,14 +33,14 @@ jid: "{{ __ee_registry_indexes_job_async_result_item.ansible_job_id }}" register: __ee_registry_indexes_job_async_result until: __ee_registry_indexes_job_async_result.finished - retries: "{{ ah_configuration_ee_registry_index_async_retries }}" - delay: "{{ ah_configuration_ee_registry_index_async_delay }}" + retries: "{{ hub_configuration_ee_registry_index_async_retries }}" + delay: "{{ hub_configuration_ee_registry_index_async_delay }}" loop: "{{ __ee_registry_indexes_job_async.results }}" loop_control: loop_var: __ee_registry_indexes_job_async_result_item label: "{{ __operation.verb }} Label {{ __ee_registry_indexes_job_async_result_item.__hub_ee_registry_index_item.name }} | Wait for finish the Label {{ __operation.action }}" when: __ee_registry_indexes_job_async_result_item.ansible_job_id is defined - no_log: "{{ ah_configuration_ee_registry_secure_logging }}" + no_log: "{{ hub_configuration_ee_registry_secure_logging }}" vars: __operation: "{{ operation_translate[__ee_registry_indexes_job_async_result_item.state | default(platform_state) | default('present')] }}" ansible_async_dir: '{{ aap_configuration_async_dir }}' diff --git a/roles/hub_ee_registry_index/tests/vars/ee_registries.yml b/roles/hub_ee_registry_index/tests/vars/ee_registries.yml index 1487ca477..d3501ee4f 100644 --- a/roles/hub_ee_registry_index/tests/vars/ee_registries.yml +++ b/roles/hub_ee_registry_index/tests/vars/ee_registries.yml @@ -1,5 +1,5 @@ --- -ah_ee_registries: +hub_ee_registries: - name: registry.redhat url: registry.redhat.io username: myuser diff --git a/roles/hub_ee_registry_sync/README.md b/roles/hub_ee_registry_sync/README.md index 188f0b9d0..834ac8a07 100644 --- a/roles/hub_ee_registry_sync/README.md +++ b/roles/hub_ee_registry_sync/README.md @@ -15,18 +15,18 @@ An Ansible Role to sync EE Registries in Automation Hub. |`aap_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Galaxy or Automation Hub host.|| |`ah_path_prefix`|""|no|API path used to access the api. Either galaxy, automation-hub, or custom|| |`aap_configuration_async_dir`|`null`|no|Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`.|| -|`ah_ee_registries`|`see below`|yes|Data structure describing your ee_registries, described below. (Note this is the same as for the `ee_registries` role and the variable can be combined. Note that this role will only do anything if the `sync` suboption of this variable is set to true.|| +|`hub_ee_registries`|`see below`|yes|Data structure describing your ee_registries, described below. (Note this is the same as for the `ee_registries` role and the variable can be combined. Note that this role will only do anything if the `sync` suboption of this variable is set to true.|| ### Secure Logging Variables The following Variables compliment each other. If Both variables are not set, secure logging defaults to false. The role defaults to False as normally the add ee_registry task does not include sensitive information. -ah_configuration_ee_registry_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. +hub_configuration_ee_registry_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| -|`ah_configuration_ee_registry_secure_logging`|`False`|no|Whether or not to include the sensitive Registry role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| +|`hub_configuration_ee_registry_secure_logging`|`False`|no|Whether or not to include the sensitive Registry role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| |`aap_configuration_secure_logging`|`False`|no|This variable enables secure logging as well, but is shared across multiple roles, see above.| ### Asynchronous Retry Variables @@ -39,13 +39,13 @@ This also speeds up the overall role. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| |`aap_configuration_async_timeout`|1000|no|This variable sets the async timeout for the role globally.| -|`ah_configuration_ee_repository_sync_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| +|`hub_configuration_ee_repository_sync_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| |`aap_configuration_async_retries`|50|no|This variable sets the number of retries to attempt for the role globally.| -|`ah_configuration_ee_registry_sync_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| +|`hub_configuration_ee_registry_sync_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| |`aap_configuration_loop_delay`|1000|no|This variable sets the loop_delay for the role globally.| -|`ah_configuration_registry_sync_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| +|`hub_configuration_registry_sync_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| |`aap_configuration_async_delay`|1|no|This sets the delay between retries for the role globally.| -|`ah_configuration_ee_registry_sync_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| +|`hub_configuration_ee_registry_sync_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| ## Data Structure @@ -56,7 +56,7 @@ This also speeds up the overall role. |`name`|""|yes|str|Registry name. Must be lower case containing only alphanumeric characters and underscores.| |`sync`|false|no|bool|Whether to sync the ee_registry. By default it will not sync unless this is set to true.| |`wait`|true|no|str|Whether to wait for the sync to complete| -|`interval`|`ah_configuration_ee_registry_sync_async_delay`|no|str|The interval which the sync task will be checked for completion| +|`interval`|`hub_configuration_ee_registry_sync_async_delay`|no|str|The interval which the sync task will be checked for completion| |`timeout`|""|no|str|How long to wait for the sync task to complete| ### Standard Project Data Structure @@ -65,7 +65,7 @@ This also speeds up the overall role. ```yaml --- -ah_ee_registries: +hub_ee_registries: - name: myreg url: https://quay.io/my/registry interval: 10 diff --git a/roles/hub_ee_registry_sync/defaults/main.yml b/roles/hub_ee_registry_sync/defaults/main.yml index 9dd01ebd5..dce0c4d01 100644 --- a/roles/hub_ee_registry_sync/defaults/main.yml +++ b/roles/hub_ee_registry_sync/defaults/main.yml @@ -9,17 +9,17 @@ # These are the default variables specific to the license role # a list of dictionaries describing the Automation Hub ee repository -ah_ee_registries: [] +hub_ee_registries: [] # possible fields: # - name: "registry_name" # mandatory # interval: 1 # wait: true # timeout: -ah_configuration_ee_registry_sync_async_timeout: "{{ aap_configuration_async_timeout | default(1000)}}" -ah_configuration_ee_registry_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" -ah_configuration_ee_registry_sync_async_retries: "{{ aap_configuration_async_retries | default(50) }}" -ah_configuration_ee_registry_sync_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" -ah_configuration_ee_registry_sync_async_delay: "{{ aap_configuration_async_delay | default(1) }}" +hub_configuration_ee_registry_sync_async_timeout: "{{ aap_configuration_async_timeout | default(1000)}}" +hub_configuration_ee_registry_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" +hub_configuration_ee_registry_sync_async_retries: "{{ aap_configuration_async_retries | default(50) }}" +hub_configuration_ee_registry_sync_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" +hub_configuration_ee_registry_sync_async_delay: "{{ aap_configuration_async_delay | default(1) }}" aap_configuration_async_dir: null ... diff --git a/roles/hub_ee_registry_sync/meta/argument_specs.yml b/roles/hub_ee_registry_sync/meta/argument_specs.yml index b0e12bf0b..97ff8c32c 100644 --- a/roles/hub_ee_registry_sync/meta/argument_specs.yml +++ b/roles/hub_ee_registry_sync/meta/argument_specs.yml @@ -3,7 +3,7 @@ argument_specs: main: short_description: An Ansible Role to sync execution environment registries in Automation Hub. options: - ah_ee_registries: + hub_ee_registries: default: [] required: false description: Data structure describing your ee registries to manage. If the sync option is set then the registry will be synced. @@ -11,7 +11,7 @@ argument_specs: elements: dict # Async variables - ah_configuration_ee_registry_sync_async_retries: + hub_configuration_ee_registry_sync_async_retries: default: "{{ aap_configuration_async_retries | default(50) }}" required: false description: This variable sets the number of retries to attempt for the role. @@ -19,7 +19,7 @@ argument_specs: default: 50 required: false description: This variable sets number of retries across all roles as a default. - ah_configuration_ee_registry_sync_async_delay: + hub_configuration_ee_registry_sync_async_delay: default: "{{ aap_configuration_async_delay | default(1) }}" required: false description: This variable sets delay between retries for the role. @@ -33,7 +33,7 @@ argument_specs: description: Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`. # No_log variables - ah_configuration_ee_registry_secure_logging: + hub_configuration_ee_registry_secure_logging: default: "{{ aap_configuration_secure_logging | default(false) }}" required: false type: bool diff --git a/roles/hub_ee_registry_sync/tasks/main.yml b/roles/hub_ee_registry_sync/tasks/main.yml index 85594a72a..4585f7457 100644 --- a/roles/hub_ee_registry_sync/tasks/main.yml +++ b/roles/hub_ee_registry_sync/tasks/main.yml @@ -5,7 +5,7 @@ ansible.hub.ah_ee_registry_sync: name: "{{ __hub_ee_registry_sync_item.name }}" wait: "{{ __hub_ee_registry_sync_item.wait | default(omit) }}" - interval: "{{ __hub_ee_registry_sync_item.interval | default(ah_configuration_ee_registry_sync_async_delay) }}" + interval: "{{ __hub_ee_registry_sync_item.interval | default(hub_configuration_ee_registry_sync_async_delay) }}" timeout: "{{ __hub_ee_registry_sync_item.timeout | default(omit) }}" ah_host: "{{ aap_hostname | default(omit) }}" ah_username: "{{ aap_username | default(omit) }}" @@ -13,14 +13,14 @@ ah_path_prefix: "{{ ah_path_prefix | default(omit) }}" validate_certs: "{{ aap_validate_certs | default(omit) }}" request_timeout: "{{ aap_request_timeout | default(omit) }}" - loop: "{{ ah_ee_registries }}" + loop: "{{ hub_ee_registries }}" loop_control: loop_var: __hub_ee_registry_sync_item label: "{{ __operation.verb }} the EE registry sync {{ __hub_ee_registry_sync_item.name }} in Hub" - pause: "{{ ah_configuration_ee_registry_sync_loop_delay }}" + pause: "{{ hub_configuration_ee_registry_sync_loop_delay }}" when: __hub_ee_registry_sync_item.sync | default(false) - no_log: "{{ ah_configuration_ee_registry_secure_logging }}" - async: "{{ ah_configuration_ee_registry_sync_async_timeout }}" + no_log: "{{ hub_configuration_ee_registry_secure_logging }}" + async: "{{ hub_configuration_ee_registry_sync_async_timeout }}" poll: 0 register: __ee_registry_syncs_job_async changed_when: not __ee_registry_syncs_job_async.changed @@ -33,14 +33,14 @@ jid: "{{ __ee_registry_syncs_job_async_result_item.ansible_job_id }}" register: __ee_registry_syncs_job_async_result until: __ee_registry_syncs_job_async_result.finished - retries: "{{ ah_configuration_ee_registry_sync_async_retries }}" - delay: "{{ ah_configuration_ee_registry_sync_async_delay }}" + retries: "{{ hub_configuration_ee_registry_sync_async_retries }}" + delay: "{{ hub_configuration_ee_registry_sync_async_delay }}" loop: "{{ __ee_registry_syncs_job_async.results }}" loop_control: loop_var: __ee_registry_syncs_job_async_result_item label: "{{ __operation.verb }} Label {{ __ee_registry_syncs_job_async_result_item.__hub_ee_registry_sync_item.name }} | Wait for finish the Label {{ __operation.action }}" when: __ee_registry_syncs_job_async_result_item.ansible_job_id is defined - no_log: "{{ ah_configuration_ee_registry_secure_logging }}" + no_log: "{{ hub_configuration_ee_registry_secure_logging }}" vars: __operation: "{{ operation_translate[__ee_registry_syncs_job_async_result_item.state | default(platform_state) | default('present')] }}" ansible_async_dir: '{{ aap_configuration_async_dir }}' diff --git a/roles/hub_ee_registry_sync/tests/vars/ee_registries.yml b/roles/hub_ee_registry_sync/tests/vars/ee_registries.yml index 1487ca477..d3501ee4f 100644 --- a/roles/hub_ee_registry_sync/tests/vars/ee_registries.yml +++ b/roles/hub_ee_registry_sync/tests/vars/ee_registries.yml @@ -1,5 +1,5 @@ --- -ah_ee_registries: +hub_ee_registries: - name: registry.redhat url: registry.redhat.io username: myuser diff --git a/roles/hub_ee_repository/README.md b/roles/hub_ee_repository/README.md index 2d160062d..c78a1164c 100644 --- a/roles/hub_ee_repository/README.md +++ b/roles/hub_ee_repository/README.md @@ -15,18 +15,18 @@ An Ansible Role to create Repositories in Automation Hub. |`aap_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Galaxy or Automation Hub host.|| |`ah_path_prefix`|""|no|API path used to access the api. Either galaxy, automation-hub, or custom|| |`aap_configuration_async_dir`|`null`|no|Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`.|| -|`ah_ee_repositories`|`see below`|yes|Data structure describing your ee_repositories, described below.|| +|`hub_ee_repositories`|`see below`|yes|Data structure describing your ee_repositories, described below.|| ### Secure Logging Variables The following Variables compliment each other. If Both variables are not set, secure logging defaults to false. The role defaults to False as normally the add ee_repository task does not include sensitive information. -ah_configuration_ee_repository_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. +hub_configuration_ee_repository_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| -|`ah_configuration_ee_repository_secure_logging`|`False`|no|Whether or not to include the sensitive Namespace role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| +|`hub_configuration_ee_repository_secure_logging`|`False`|no|Whether or not to include the sensitive Namespace role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| |`aap_configuration_secure_logging`|`False`|no|This variable enables secure logging as well, but is shared across multiple roles, see above.| ### Asynchronous Retry Variables @@ -39,13 +39,13 @@ This also speeds up the overall role. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| |`aap_configuration_async_timeout`|1000|no|This variable sets the async timeout for the role globally.| -|`ah_configuration_ee_repository_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| +|`hub_configuration_ee_repository_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| |`aap_configuration_async_retries`|50|no|This variable sets the number of retries to attempt for the role globally.| -|`ah_configuration_ee_repository_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| +|`hub_configuration_ee_repository_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| |`aap_configuration_loop_delay`|1000|no|This variable sets the loop_delay for the role globally.| -|`ah_configuration_ee_repository_sync_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| +|`hub_configuration_ee_repository_sync_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| |`aap_configuration_async_delay`|1|no|This sets the delay between retries for the role globally.| -|`ah_configuration_ee_repository_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| +|`hub_configuration_ee_repository_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| ## Data Structure @@ -69,7 +69,7 @@ This also speeds up the overall role. ```yaml --- -ah_ee_repositories: +hub_ee_repositories: - name: abc15 description: string readme: "# My ee repo" diff --git a/roles/hub_ee_repository/defaults/main.yml b/roles/hub_ee_repository/defaults/main.yml index 17c5705e7..f77cd3b20 100644 --- a/roles/hub_ee_repository/defaults/main.yml +++ b/roles/hub_ee_repository/defaults/main.yml @@ -9,17 +9,17 @@ # These are the default variables specific to the license role # a list of dictionaries describing the Automation Hub ee repository -ah_ee_repositories: [] +hub_ee_repositories: [] # possible fields: # - name: "namespace_name" # mandatory # description: "A description" # readme: "The contents of a readme will go here" # readme_file: "readme.md" -ah_configuration_ee_repository_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" -ah_configuration_ee_repository_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" -ah_configuration_ee_repository_async_retries: "{{ aap_configuration_async_retries | default(50) }}" -ah_configuration_ee_repository_sync_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" -ah_configuration_ee_repository_async_delay: "{{ aap_configuration_async_delay | default(1) }}" +hub_configuration_ee_repository_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" +hub_configuration_ee_repository_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" +hub_configuration_ee_repository_async_retries: "{{ aap_configuration_async_retries | default(50) }}" +hub_configuration_ee_repository_sync_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" +hub_configuration_ee_repository_async_delay: "{{ aap_configuration_async_delay | default(1) }}" aap_configuration_async_dir: null ... diff --git a/roles/hub_ee_repository/meta/argument_specs.yml b/roles/hub_ee_repository/meta/argument_specs.yml index 3113e1df4..5335e397f 100644 --- a/roles/hub_ee_repository/meta/argument_specs.yml +++ b/roles/hub_ee_repository/meta/argument_specs.yml @@ -3,7 +3,7 @@ argument_specs: main: short_description: An Ansible Role to create execution environment repositories in Automation Hub. options: - ah_ee_repositories: + hub_ee_repositories: default: [] required: false description: Data structure describing your ee repositories to manage. @@ -11,7 +11,7 @@ argument_specs: elements: dict # Async variables - ah_configuration_ee_repository_async_retries: + hub_configuration_ee_repository_async_retries: default: "{{ aap_configuration_async_retries | default(50) }}" required: false description: This variable sets the number of retries to attempt for the role. @@ -19,7 +19,7 @@ argument_specs: default: 50 required: false description: This variable sets number of retries across all roles as a default. - ah_configuration_ee_repository_async_delay: + hub_configuration_ee_repository_async_delay: default: "{{ aap_configuration_async_delay | default(1) }}" required: false description: This variable sets delay between retries for the role. @@ -33,7 +33,7 @@ argument_specs: description: Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`. # No_log variables - ah_configuration_ee_repository_secure_logging: + hub_configuration_ee_repository_secure_logging: default: "{{ aap_configuration_secure_logging | default(false) }}" required: false type: bool diff --git a/roles/hub_ee_repository/tasks/main.yml b/roles/hub_ee_repository/tasks/main.yml index 225db776e..3fe4d3cbe 100644 --- a/roles/hub_ee_repository/tasks/main.yml +++ b/roles/hub_ee_repository/tasks/main.yml @@ -18,13 +18,13 @@ ah_path_prefix: "{{ ah_path_prefix | default(omit) }}" validate_certs: "{{ aap_validate_certs | default(omit) }}" request_timeout: "{{ aap_request_timeout | default(omit) }}" - loop: "{{ ah_ee_repositories }}" + loop: "{{ hub_ee_repositories }}" loop_control: loop_var: __hub_ee_repository_sync_item label: "{{ __operation.verb }} the EE repository {{ __hub_ee_repository_sync_item.name }} in Hub" - pause: "{{ ah_configuration_ee_repository_sync_loop_delay }}" - no_log: "{{ ah_configuration_ee_repository_secure_logging }}" - async: "{{ ah_configuration_ee_repository_async_timeout }}" + pause: "{{ hub_configuration_ee_repository_sync_loop_delay }}" + no_log: "{{ hub_configuration_ee_repository_secure_logging }}" + async: "{{ hub_configuration_ee_repository_async_timeout }}" poll: 0 register: __ee_repositories_job_async changed_when: not __ee_repositories_job_async.changed @@ -37,14 +37,14 @@ jid: "{{ __ee_repositories_job_async_result_item.ansible_job_id }}" register: __ee_repositories_job_async_result until: __ee_repositories_job_async_result.finished - retries: "{{ ah_configuration_ee_repository_async_retries }}" - delay: "{{ ah_configuration_ee_repository_async_delay }}" + retries: "{{ hub_configuration_ee_repository_async_retries }}" + delay: "{{ hub_configuration_ee_repository_async_delay }}" loop: "{{ __ee_repositories_job_async.results }}" loop_control: loop_var: __ee_repositories_job_async_result_item label: "{{ __operation.verb }} Label {{ __ee_repositories_job_async_result_item.__hub_ee_repository_sync_item.name }} | Wait for finish the Label {{ __operation.action }}" when: __ee_repositories_job_async_result_item.ansible_job_id is defined - no_log: "{{ ah_configuration_ee_repository_secure_logging }}" + no_log: "{{ hub_configuration_ee_repository_secure_logging }}" vars: __operation: "{{ operation_translate[__ee_repositories_job_async_result_item.state | default(platform_state) | default('present')] }}" ansible_async_dir: '{{ aap_configuration_async_dir }}' diff --git a/roles/hub_ee_repository/tests/vars/ee_repositories.yml b/roles/hub_ee_repository/tests/vars/ee_repositories.yml index eeb343179..6d49cad6f 100644 --- a/roles/hub_ee_repository/tests/vars/ee_repositories.yml +++ b/roles/hub_ee_repository/tests/vars/ee_repositories.yml @@ -1,5 +1,5 @@ --- -ah_ee_repositories: +hub_ee_repositories: - name: abc15 description: string readme: "# My EE repository" diff --git a/roles/hub_ee_repository_sync/README.md b/roles/hub_ee_repository_sync/README.md index d69548a68..a6b496871 100644 --- a/roles/hub_ee_repository_sync/README.md +++ b/roles/hub_ee_repository_sync/README.md @@ -15,18 +15,18 @@ An Ansible Role to sync EE Repositories in Automation Hub. |`aap_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Galaxy or Automation Hub host.|| |`ah_path_prefix`|""|no|API path used to access the api. Either galaxy, automation-hub, or custom|| |`aap_configuration_async_dir`|`null`|no|Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`.|| -|`ah_ee_repositories`|`see below`|yes|Data structure describing your ee_repositories, described below. (Note this is the same as for the `ee_repository` role and the variable can be combined. Note that this role will only do anything if the `sync` suboption of this variable is set to true.|| +|`hub_ee_repositories`|`see below`|yes|Data structure describing your ee_repositories, described below. (Note this is the same as for the `ee_repository` role and the variable can be combined. Note that this role will only do anything if the `sync` suboption of this variable is set to true.|| ### Secure Logging Variables The following Variables compliment each other. If Both variables are not set, secure logging defaults to false. The role defaults to False as normally the add ee_repository task does not include sensitive information. -ah_configuration_ee_repository_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. +hub_configuration_ee_repository_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| -|`ah_configuration_ee_repository_secure_logging`|`False`|no|Whether or not to include the sensitive Repository role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| +|`hub_configuration_ee_repository_secure_logging`|`False`|no|Whether or not to include the sensitive Repository role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| |`aap_configuration_secure_logging`|`False`|no|This variable enables secure logging as well, but is shared across multiple roles, see above.| ### Asynchronous Retry Variables @@ -39,13 +39,13 @@ This also speeds up the overall role. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| |`aap_configuration_async_timeout`|1000|no|This variable sets the async timeout for the role globally.| -|`ah_configuration_ee_repository_sync_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| +|`hub_configuration_ee_repository_sync_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| |`aap_configuration_async_retries`|50|no|This variable sets the number of retries to attempt for the role globally.| -|`ah_configuration_ee_repository_sync_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| +|`hub_configuration_ee_repository_sync_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| |`aap_configuration_loop_delay`|1000|no|This variable sets the loop_delay for the role globally.| -|`ah_configuration_ee_repository_sync_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| +|`hub_configuration_ee_repository_sync_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| |`aap_configuration_async_delay`|1|no|This sets the delay between retries for the role globally.| -|`ah_configuration_ee_repository_sync_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| +|`hub_configuration_ee_repository_sync_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| ## Data Structure @@ -56,7 +56,7 @@ This also speeds up the overall role. |`name`|""|yes|str|Repository name. Must be lower case containing only alphanumeric characters and underscores.| |`sync`|false|no|bool|Whether to sync the ee_registry. By default it will not sync unless this is set to true.| |`wait`|true|no|str|Whether to wait for the sync to complete| -|`interval`|`ah_configuration_ee_repository_sync_async_delay`|no|str|The interval which the sync task will be checked for completion| +|`interval`|`hub_configuration_ee_repository_sync_async_delay`|no|str|The interval which the sync task will be checked for completion| |`timeout`|""|no|str|How long to wait for the sync task to complete| ### Standard Project Data Structure @@ -65,7 +65,7 @@ This also speeds up the overall role. ```yaml --- -ah_ee_repositories: +hub_ee_repositories: - name: abc15 description: string readme: "# My EE repository" diff --git a/roles/hub_ee_repository_sync/defaults/main.yml b/roles/hub_ee_repository_sync/defaults/main.yml index d8f93fd51..5fd884bdd 100644 --- a/roles/hub_ee_repository_sync/defaults/main.yml +++ b/roles/hub_ee_repository_sync/defaults/main.yml @@ -9,17 +9,17 @@ # These are the default variables specific to the license role # a list of dictionaries describing the Automation Hub ee repository -ah_ee_repositories: [] +hub_ee_repositories: [] # possible fields: # - name: "namespace_name" # mandatory # interval: 1 # wait: true # timeout: -ah_configuration_ee_repository_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" -ah_configuration_ee_repository_sync_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" -ah_configuration_ee_repository_sync_async_retries: "{{ aap_configuration_async_retries | default(50) }}" -ah_configuration_ee_repository_sync_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" -ah_configuration_ee_repository_sync_async_delay: "{{ aap_configuration_async_delay | default(1) }}" +hub_configuration_ee_repository_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" +hub_configuration_ee_repository_sync_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" +hub_configuration_ee_repository_sync_async_retries: "{{ aap_configuration_async_retries | default(50) }}" +hub_configuration_ee_repository_sync_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" +hub_configuration_ee_repository_sync_async_delay: "{{ aap_configuration_async_delay | default(1) }}" aap_configuration_async_dir: null ... diff --git a/roles/hub_ee_repository_sync/meta/argument_specs.yml b/roles/hub_ee_repository_sync/meta/argument_specs.yml index 366d65499..afe587650 100644 --- a/roles/hub_ee_repository_sync/meta/argument_specs.yml +++ b/roles/hub_ee_repository_sync/meta/argument_specs.yml @@ -3,7 +3,7 @@ argument_specs: main: short_description: An Ansible Role to sync execution environment repositories in Automation Hub. options: - ah_ee_repositories: + hub_ee_repositories: default: [] required: false description: Data structure describing your ee repositories to manage. If the sync option is set then the repository will be synced. @@ -11,7 +11,7 @@ argument_specs: elements: dict # Async variables - ah_configuration_ee_repository_sync_async_retries: + hub_configuration_ee_repository_sync_async_retries: default: "{{ aap_configuration_async_retries | default(50) }}" required: false description: This variable sets the number of retries to attempt for the role. @@ -19,7 +19,7 @@ argument_specs: default: 50 required: false description: This variable sets number of retries across all roles as a default. - ah_configuration_ee_repository_sync_async_delay: + hub_configuration_ee_repository_sync_async_delay: default: "{{ aap_configuration_async_delay | default(1) }}" required: false description: This variable sets delay between retries for the role. @@ -33,7 +33,7 @@ argument_specs: description: Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`. # No_log variables - ah_configuration_ee_repository_secure_logging: + hub_configuration_ee_repository_secure_logging: default: "{{ aap_configuration_secure_logging | default(false) }}" required: false type: bool diff --git a/roles/hub_ee_repository_sync/tasks/main.yml b/roles/hub_ee_repository_sync/tasks/main.yml index 000346f34..ff59149ea 100644 --- a/roles/hub_ee_repository_sync/tasks/main.yml +++ b/roles/hub_ee_repository_sync/tasks/main.yml @@ -5,7 +5,7 @@ ansible.hub.ah_ee_repository_sync: name: "{{ __hub_ee_repository_sync_item.name }}" wait: "{{ __hub_ee_repository_sync_item.wait | default(omit) }}" - interval: "{{ __hub_ee_repository_sync_item.interval | default(ah_configuration_ee_repository_sync_async_delay) }}" + interval: "{{ __hub_ee_repository_sync_item.interval | default(hub_configuration_ee_repository_sync_async_delay) }}" timeout: "{{ __hub_ee_repository_sync_item.timeout | default(omit) }}" ah_host: "{{ aap_hostname | default(omit) }}" ah_username: "{{ aap_username | default(omit) }}" @@ -13,14 +13,14 @@ ah_path_prefix: "{{ ah_path_prefix | default(omit) }}" validate_certs: "{{ aap_validate_certs | default(omit) }}" request_timeout: "{{ aap_request_timeout | default(omit) }}" - loop: "{{ ah_ee_repositories }}" + loop: "{{ hub_ee_repositories }}" loop_control: loop_var: __hub_ee_repository_sync_item label: "{{ __operation.verb }} the EE repository sync {{ __hub_ee_repository_sync_item.name }} in Hub" - pause: "{{ ah_configuration_ee_repository_sync_loop_delay }}" + pause: "{{ hub_configuration_ee_repository_sync_loop_delay }}" when: __hub_ee_repository_sync_item.sync | default(false) - no_log: "{{ ah_configuration_ee_repository_secure_logging }}" - async: "{{ ah_configuration_ee_repository_sync_async_timeout }}" + no_log: "{{ hub_configuration_ee_repository_secure_logging }}" + async: "{{ hub_configuration_ee_repository_sync_async_timeout }}" poll: 0 register: __ee_repository_syncs_job_async changed_when: not __ee_repository_syncs_job_async.changed @@ -33,14 +33,14 @@ jid: "{{ __ee_repository_syncs_job_async_result_item.ansible_job_id }}" register: __ee_repository_syncs_job_async_result until: __ee_repository_syncs_job_async_result.finished - retries: "{{ ah_configuration_ee_repository_sync_async_retries }}" - delay: "{{ ah_configuration_ee_repository_sync_async_delay }}" + retries: "{{ hub_configuration_ee_repository_sync_async_retries }}" + delay: "{{ hub_configuration_ee_repository_sync_async_delay }}" loop: "{{ __ee_repository_syncs_job_async.results }}" loop_control: loop_var: __ee_repository_syncs_job_async_result_item label: "{{ __operation.verb }} Label {{ __ee_repository_syncs_job_async_result_item.__hub_ee_repository_sync_item.name }} | Wait for finish the Label {{ __operation.action }}" when: __ee_repository_syncs_job_async_result_item.ansible_job_id is defined - no_log: "{{ ah_configuration_ee_repository_secure_logging }}" + no_log: "{{ hub_configuration_ee_repository_secure_logging }}" vars: __operation: "{{ operation_translate[__ee_repository_syncs_job_async_result_item.state | default(platform_state) | default('present')] }}" ansible_async_dir: '{{ aap_configuration_async_dir }}' diff --git a/roles/hub_ee_repository_sync/tests/vars/ee_repositories.yml b/roles/hub_ee_repository_sync/tests/vars/ee_repositories.yml index 7e3d4d3bd..e91b9e1fe 100644 --- a/roles/hub_ee_repository_sync/tests/vars/ee_repositories.yml +++ b/roles/hub_ee_repository_sync/tests/vars/ee_repositories.yml @@ -1,5 +1,5 @@ --- -ah_ee_repositories: +hub_ee_repositories: - name: abc15 description: string readme: "# My EE repository" diff --git a/roles/hub_group/README.md b/roles/hub_group/README.md index d02a4dbbf..b6fe86349 100644 --- a/roles/hub_group/README.md +++ b/roles/hub_group/README.md @@ -22,11 +22,11 @@ An Ansible Role to create groups in Automation Hub. The following Variables compliment each other. If Both variables are not set, secure logging defaults to false. The role defaults to False as normally the add group task does not include sensitive information. -ah_configuration_group_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. +hub_configuration_group_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| -|`ah_configuration_group_secure_logging`|`False`|no|Whether or not to include the sensitive Namespace role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| +|`hub_configuration_group_secure_logging`|`False`|no|Whether or not to include the sensitive Namespace role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| |`aap_configuration_secure_logging`|`False`|no|This variable enables secure logging as well, but is shared across multiple roles, see above.| ### Asynchronous Retry Variables @@ -39,11 +39,11 @@ This also speeds up the overall role. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| |`aap_configuration_async_retries`|50|no|This variable sets the number of retries to attempt for the role globally.| -|`ah_configuration_group_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| +|`hub_configuration_group_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| |`aap_configuration_loop_delay`|1000|no|This variable sets the loop_delay for the role globally.| -|`ah_configuration_group_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| +|`hub_configuration_group_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| |`aap_configuration_async_delay`|1|no|This sets the delay between retries for the role globally.| -|`ah_configuration_group_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| +|`hub_configuration_group_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| ## Data Structure diff --git a/roles/hub_group/defaults/main.yml b/roles/hub_group/defaults/main.yml index 98ba38f92..800f223bf 100644 --- a/roles/hub_group/defaults/main.yml +++ b/roles/hub_group/defaults/main.yml @@ -14,10 +14,10 @@ aap_teams: [] # - name # - perms # - state -ah_configuration_group_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" -ah_configuration_group_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" -ah_configuration_group_async_retries: "{{ aap_configuration_async_retries | default(50) }}" -ah_configuration_group_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" -ah_configuration_group_async_delay: "{{ aap_configuration_async_delay | default(1) }}" +hub_configuration_group_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" +hub_configuration_group_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" +hub_configuration_group_async_retries: "{{ aap_configuration_async_retries | default(50) }}" +hub_configuration_group_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" +hub_configuration_group_async_delay: "{{ aap_configuration_async_delay | default(1) }}" aap_configuration_async_dir: null ... diff --git a/roles/hub_group/meta/argument_specs.yml b/roles/hub_group/meta/argument_specs.yml index aab231ec0..e43c9b3e7 100644 --- a/roles/hub_group/meta/argument_specs.yml +++ b/roles/hub_group/meta/argument_specs.yml @@ -11,7 +11,7 @@ argument_specs: elements: dict # Async variables - ah_configuration_group_async_retries: + hub_configuration_group_async_retries: default: "{{ aap_configuration_async_retries | default(50) }}" required: false description: This variable sets the number of retries to attempt for the role. @@ -19,7 +19,7 @@ argument_specs: default: 50 required: false description: This variable sets number of retries across all roles as a default. - ah_configuration_group_async_delay: + hub_configuration_group_async_delay: default: "{{ aap_configuration_async_delay | default(1) }}" required: false description: This variable sets delay between retries for the role. @@ -33,7 +33,7 @@ argument_specs: description: Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`. # No_log variables - ah_configuration_group_secure_logging: + hub_configuration_group_secure_logging: default: "{{ aap_configuration_secure_logging | default(false) }}" required: false type: bool diff --git a/roles/hub_group/tasks/main.yml b/roles/hub_group/tasks/main.yml index ca558bf9e..21d09d84b 100644 --- a/roles/hub_group/tasks/main.yml +++ b/roles/hub_group/tasks/main.yml @@ -16,9 +16,9 @@ loop_control: loop_var: __hub_group_item label: "{{ __operation.verb }} the group {{ __hub_group_item.name }} in Hub" - pause: "{{ ah_configuration_group_loop_delay }}" - no_log: "{{ ah_configuration_group_secure_logging }}" - async: "{{ ah_configuration_group_async_timeout }}" + pause: "{{ hub_configuration_group_loop_delay }}" + no_log: "{{ hub_configuration_group_secure_logging }}" + async: "{{ hub_configuration_group_async_timeout }}" poll: 0 register: __groups_job_async changed_when: not __groups_job_async.changed @@ -31,14 +31,14 @@ jid: "{{ __groups_job_async_result_item.ansible_job_id }}" register: __groups_job_async_result until: __groups_job_async_result.finished - retries: "{{ ah_configuration_group_async_retries }}" - delay: "{{ ah_configuration_group_async_delay }}" + retries: "{{ hub_configuration_group_async_retries }}" + delay: "{{ hub_configuration_group_async_delay }}" loop: "{{ __groups_job_async.results }}" loop_control: loop_var: __groups_job_async_result_item label: "{{ __operation.verb }} Label {{ __groups_job_async_result_item.__hub_group_item.name }} | Wait for finish the Label {{ __operation.action }}" when: __groups_job_async_result_item.ansible_job_id is defined - no_log: "{{ ah_configuration_group_secure_logging }}" + no_log: "{{ hub_configuration_group_secure_logging }}" vars: __operation: "{{ operation_translate[__groups_job_async_result_item.state | default(platform_state) | default('present')] }}" ansible_async_dir: '{{ aap_configuration_async_dir }}' diff --git a/roles/hub_group_roles/README.md b/roles/hub_group_roles/README.md index 4707fa6d5..9a1fd7913 100644 --- a/roles/hub_group_roles/README.md +++ b/roles/hub_group_roles/README.md @@ -15,18 +15,18 @@ An Ansible Role to add roles to groups in Automation Hub. |`aap_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Galaxy or Automation Hub host.|| |`ah_path_prefix`|""|no|API path used to access the api. Either galaxy, automation-hub, or custom|| |`aap_configuration_async_dir`|`null`|no|Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`.|| -|`ah_group_roles`|`see below`|yes|Data structure describing the roles which are applied to groups, described below.|| +|`hub_group_roles`|`see below`|yes|Data structure describing the roles which are applied to groups, described below.|| ### Secure Logging Variables The following Variables compliment each other. If Both variables are not set, secure logging defaults to false. The role defaults to False as normally the add group task does not include sensitive information. -ah_configuration_group_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. +hub_configuration_group_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| -|`ah_configuration_group_secure_logging`|`False`|no|Whether or not to include the sensitive Namespace role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| +|`hub_configuration_group_secure_logging`|`False`|no|Whether or not to include the sensitive Namespace role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| |`aap_configuration_secure_logging`|`False`|no|This variable enables secure logging as well, but is shared across multiple roles, see above.| ### Asynchronous Retry Variables @@ -39,13 +39,13 @@ This also speeds up the overall role. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| |`aap_configuration_async_timeout`|1000|no|This variable sets the async timeout for the role globally.| -|`ah_configuration_group_roles_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| +|`hub_configuration_group_roles_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| |`aap_configuration_async_retries`|50|no|This variable sets the number of retries to attempt for the role globally.| -|`ah_configuration_group_roles_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| +|`hub_configuration_group_roles_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| |`aap_configuration_loop_delay`|1000|no|This variable sets the loop_delay for the role globally.| -|`ah_configuration_group_roles_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| +|`hub_configuration_group_roles_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| |`aap_configuration_async_delay`|1|no|This sets the delay between retries for the role globally.| -|`ah_configuration_group_roles_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| +|`hub_configuration_group_roles_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| ## Data Structure @@ -87,7 +87,7 @@ Targets consist of the following. ```yaml --- -ah_group_roles: +hub_group_roles: - state: present groups: - santa diff --git a/roles/hub_group_roles/defaults/main.yml b/roles/hub_group_roles/defaults/main.yml index 271c6624b..0bf1d4b0c 100644 --- a/roles/hub_group_roles/defaults/main.yml +++ b/roles/hub_group_roles/defaults/main.yml @@ -9,14 +9,14 @@ # These are the default variables specific to the license role # a list of dictionaries describing the Automation Hub groups roles -ah_group_roles: [] +hub_group_roles: [] # - groups # - role_list -ah_configuration_group_roles_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" -ah_configuration_group_roles_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" -ah_configuration_group_roles_async_retries: "{{ aap_configuration_async_retries | default(50) }}" -ah_configuration_group_roles_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" -ah_configuration_group_roles_async_delay: "{{ aap_configuration_async_delay | default(1) }}" +hub_configuration_group_roles_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" +hub_configuration_group_roles_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" +hub_configuration_group_roles_async_retries: "{{ aap_configuration_async_retries | default(50) }}" +hub_configuration_group_roles_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" +hub_configuration_group_roles_async_delay: "{{ aap_configuration_async_delay | default(1) }}" aap_configuration_async_dir: null ... diff --git a/roles/hub_group_roles/meta/argument_specs.yml b/roles/hub_group_roles/meta/argument_specs.yml index a14770d23..d9f6d53b3 100644 --- a/roles/hub_group_roles/meta/argument_specs.yml +++ b/roles/hub_group_roles/meta/argument_specs.yml @@ -3,7 +3,7 @@ argument_specs: main: short_description: An Ansible Role to create groups roles in Automation Hub. options: - ah_group_roles: + hub_group_roles: default: [] required: false description: Data structure describing your groups roles to manage. @@ -11,7 +11,7 @@ argument_specs: elements: dict # Async variables - ah_configuration_group_async_retries: + hub_configuration_group_async_retries: default: "{{ aap_configuration_async_retries | default(50) }}" required: false description: This variable sets the number of retries to attempt for the role. @@ -19,7 +19,7 @@ argument_specs: default: 50 required: false description: This variable sets number of retries across all roles as a default. - ah_configuration_group_async_delay: + hub_configuration_group_async_delay: default: "{{ aap_configuration_async_delay | default(1) }}" required: false description: This variable sets delay between retries for the role. @@ -33,7 +33,7 @@ argument_specs: description: Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`. # No_log variables - ah_configuration_group_secure_logging: + hub_configuration_group_secure_logging: default: "{{ aap_configuration_secure_logging | default(false) }}" required: false type: bool diff --git a/roles/hub_group_roles/tasks/main.yml b/roles/hub_group_roles/tasks/main.yml index 4f4963ced..e8a68871e 100644 --- a/roles/hub_group_roles/tasks/main.yml +++ b/roles/hub_group_roles/tasks/main.yml @@ -11,13 +11,13 @@ ah_path_prefix: "{{ ah_path_prefix | default(omit) }}" validate_certs: "{{ aap_validate_certs | default(omit) }}" request_timeout: "{{ aap_request_timeout | default(omit) }}" - loop: "{{ ah_group_roles }}" + loop: "{{ hub_group_roles }}" loop_control: loop_var: __hub_group_roles_item label: "{{ __operation.verb }} the group role {{ __hub_group_roles_item.groups }} in Hub" - pause: "{{ ah_configuration_group_roles_loop_delay }}" - no_log: "{{ ah_configuration_group_roles_secure_logging }}" - async: "{{ ah_configuration_group_roles_async_timeout }}" + pause: "{{ hub_configuration_group_roles_loop_delay }}" + no_log: "{{ hub_configuration_group_roles_secure_logging }}" + async: "{{ hub_configuration_group_roles_async_timeout }}" poll: 0 register: __group_roles_job_async changed_when: not __group_roles_job_async.changed @@ -30,14 +30,14 @@ jid: "{{ __group_roles_job_async_result_item.ansible_job_id }}" register: __group_roles_job_async_result until: __group_roles_job_async_result.finished - retries: "{{ ah_configuration_group_roles_async_retries }}" - delay: "{{ ah_configuration_group_roles_async_delay }}" + retries: "{{ hub_configuration_group_roles_async_retries }}" + delay: "{{ hub_configuration_group_roles_async_delay }}" loop: "{{ __group_roles_job_async.results }}" loop_control: loop_var: __group_roles_job_async_result_item label: "{{ __operation.verb }} Label {{ __group_roles_job_async_result_item.__hub_group_roles_item.groups }} | Wait for finish the Label {{ __operation.action }}" when: __group_roles_job_async_result_item.ansible_job_id is defined - no_log: "{{ ah_configuration_group_roles_secure_logging }}" + no_log: "{{ hub_configuration_group_roles_secure_logging }}" vars: __operation: "{{ operation_translate[__group_roles_job_async_result_item.state | default(platform_state) | default('present')] }}" ansible_async_dir: '{{ aap_configuration_async_dir }}' diff --git a/roles/hub_group_roles/tests/vars/group_roles.yml b/roles/hub_group_roles/tests/vars/group_roles.yml index f120c4375..58b76fedc 100644 --- a/roles/hub_group_roles/tests/vars/group_roles.yml +++ b/roles/hub_group_roles/tests/vars/group_roles.yml @@ -1,5 +1,5 @@ --- -ah_group_roles: +hub_group_roles: - state: present groups: - santa diff --git a/roles/hub_namespace/README.md b/roles/hub_namespace/README.md index f8553c25f..7529bf8b9 100644 --- a/roles/hub_namespace/README.md +++ b/roles/hub_namespace/README.md @@ -16,18 +16,18 @@ An Ansible Role to create Namespaces in Automation Hub. |`aap_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Galaxy or Automation Hub host.|| |`ah_path_prefix`|""|no|API path used to access the api. Either galaxy, automation-hub, or custom|| |`aap_configuration_async_dir`|`null`|no|Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`.|| -|`ah_namespaces`|`see below`|yes|Data structure describing your namespaces, described below.|| +|`hub_namespaces`|`see below`|yes|Data structure describing your namespaces, described below.|| ### Secure Logging Variables The following Variables compliment each other. If Both variables are not set, secure logging defaults to false. The role defaults to False as normally the add namespace task does not include sensitive information. -ah_configuration_namespace_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. +hub_configuration_namespace_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| -|`ah_configuration_namespace_secure_logging`|`False`|no|Whether or not to include the sensitive Namespace role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| +|`hub_configuration_namespace_secure_logging`|`False`|no|Whether or not to include the sensitive Namespace role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| |`aap_configuration_secure_logging`|`False`|no|This variable enables secure logging as well, but is shared across multiple roles, see above.| ### Asynchronous Retry Variables @@ -40,13 +40,13 @@ This also speeds up the overall role. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| |`aap_configuration_async_timeout`|1000|no|This variable sets the async timeout for the role globally.| -|`ah_configuration_namespace_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| +|`hub_configuration_namespace_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| |`aap_configuration_async_retries`|50|no|This variable sets the number of retries to attempt for the role globally.| -|`ah_configuration_namespace_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| +|`hub_configuration_namespace_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| |`aap_configuration_loop_delay`|1000|no|This variable sets the loop_delay for the role globally.| -|`ah_configuration_namespace_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| +|`hub_configuration_namespace_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| |`aap_configuration_async_delay`|1|no|This sets the delay between retries for the role globally.| -|`ah_configuration_namespace_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| +|`hub_configuration_namespace_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| ## Data Structure @@ -78,7 +78,7 @@ This also speeds up the overall role. ```yaml --- -ah_namespaces: +hub_namespaces: - name: abc15 company: Redhat email: user@example.com diff --git a/roles/hub_namespace/defaults/main.yml b/roles/hub_namespace/defaults/main.yml index c56f9b99b..ab287504f 100644 --- a/roles/hub_namespace/defaults/main.yml +++ b/roles/hub_namespace/defaults/main.yml @@ -9,7 +9,7 @@ # These are the default variables specific to the license role # a list of dictionaries describing the Automation Hub namespace -ah_namespaces: [] +hub_namespaces: [] # possible fields: # - name: "namespace_name" # mandatory # company: Redhat @@ -25,10 +25,10 @@ ah_namespaces: [] # object_roles: #Possible options below # - # mandatory, choices: change_namespace, upload_to_namespace -ah_configuration_namespace_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" -ah_configuration_namespace_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" -ah_configuration_namespace_async_retries: "{{ aap_configuration_async_retries | default(50) }}" -ah_configuration_namespace_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" -ah_configuration_namespace_async_delay: "{{ aap_configuration_async_delay | default(1) }}" +hub_configuration_namespace_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" +hub_configuration_namespace_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" +hub_configuration_namespace_async_retries: "{{ aap_configuration_async_retries | default(50) }}" +hub_configuration_namespace_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" +hub_configuration_namespace_async_delay: "{{ aap_configuration_async_delay | default(1) }}" aap_configuration_async_dir: null ... diff --git a/roles/hub_namespace/meta/argument_specs.yml b/roles/hub_namespace/meta/argument_specs.yml index f396a26a6..c676f4d50 100644 --- a/roles/hub_namespace/meta/argument_specs.yml +++ b/roles/hub_namespace/meta/argument_specs.yml @@ -3,7 +3,7 @@ argument_specs: main: short_description: An Ansible Role to create namespaces in Automation Hub. options: - ah_namespaces: + hub_namespaces: default: [] required: false description: Data structure describing your namespaces to manage. @@ -11,7 +11,7 @@ argument_specs: elements: dict # Async variables - ah_configuration_namespace_async_retries: + hub_configuration_namespace_async_retries: default: "{{ aap_configuration_async_retries | default(50) }}" required: false description: This variable sets the number of retries to attempt for the role. @@ -19,7 +19,7 @@ argument_specs: default: 50 required: false description: This variable sets number of retries across all roles as a default. - ah_configuration_namespace_async_delay: + hub_configuration_namespace_async_delay: default: "{{ aap_configuration_async_delay | default(1) }}" required: false description: This variable sets delay between retries for the role. @@ -33,7 +33,7 @@ argument_specs: description: Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`. # No_log variables - ah_configuration_namespace_secure_logging: + hub_configuration_namespace_secure_logging: default: "{{ aap_configuration_secure_logging | default(false) }}" required: false type: bool diff --git a/roles/hub_namespace/tasks/main.yml b/roles/hub_namespace/tasks/main.yml index 0d4a97818..edb46e45f 100644 --- a/roles/hub_namespace/tasks/main.yml +++ b/roles/hub_namespace/tasks/main.yml @@ -11,7 +11,7 @@ # when: # - ah_token is not defined # - lookup("ansible.builtin.env", "AH_API_TOKEN") == "" -# - ah_namespaces | length > 1 +# - hub_namespaces | length > 1 - name: Add Automation Hub Namespace ansible.hub.ah_namespace: @@ -32,13 +32,13 @@ ah_path_prefix: "{{ ah_path_prefix | default(omit) }}" validate_certs: "{{ aap_validate_certs | default(omit) }}" request_timeout: "{{ aap_request_timeout | default(omit) }}" - loop: "{{ ah_namespaces }}" + loop: "{{ hub_namespaces }}" loop_control: loop_var: __hub_namespace_item label: "{{ __operation.verb }} the namespace {{ __hub_namespace_item.name }} in Hub" - pause: "{{ ah_configuration_namespace_loop_delay }}" - no_log: "{{ ah_configuration_namespace_secure_logging }}" - async: "{{ ah_configuration_namespace_async_timeout }}" + pause: "{{ hub_configuration_namespace_loop_delay }}" + no_log: "{{ hub_configuration_namespace_secure_logging }}" + async: "{{ hub_configuration_namespace_async_timeout }}" poll: 0 register: __namespaces_job_async changed_when: not __namespaces_job_async.changed @@ -51,14 +51,14 @@ jid: "{{ __namespaces_job_async_result_item.ansible_job_id }}" register: __namespaces_job_async_result until: __namespaces_job_async_result.finished - retries: "{{ ah_configuration_namespace_async_retries }}" - delay: "{{ ah_configuration_namespace_async_delay }}" + retries: "{{ hub_configuration_namespace_async_retries }}" + delay: "{{ hub_configuration_namespace_async_delay }}" loop: "{{ __namespaces_job_async.results }}" loop_control: loop_var: __namespaces_job_async_result_item label: "{{ __operation.verb }} Namespace {{ __namespaces_job_async_result_item.__hub_namespace_item.name }} | Wait for finish the Namespace {{ __operation.action }}" when: __namespaces_job_async_result_item.ansible_job_id is defined - no_log: "{{ ah_configuration_namespace_secure_logging }}" + no_log: "{{ hub_configuration_namespace_secure_logging }}" vars: __operation: "{{ operation_translate[__namespaces_job_async_result_item.state | default(platform_state) | default('present')] }}" ansible_async_dir: '{{ aap_configuration_async_dir }}' diff --git a/roles/hub_namespace/tests/vars/namespaces.yml b/roles/hub_namespace/tests/vars/namespaces.yml index 71b22c39e..1d20d8d08 100644 --- a/roles/hub_namespace/tests/vars/namespaces.yml +++ b/roles/hub_namespace/tests/vars/namespaces.yml @@ -1,5 +1,5 @@ --- -ah_namespaces: +hub_namespaces: - name: abc15 company: Redhat email: user@example.com diff --git a/roles/hub_publish/README.md b/roles/hub_publish/README.md index 684b0ec3e..5a01d3c69 100644 --- a/roles/hub_publish/README.md +++ b/roles/hub_publish/README.md @@ -19,19 +19,19 @@ An Ansible Role to publish collections to Automation Hub or Galaxies. |`aap_configuration_working_dir`|`/var/tmp`|no|The working directory where the built artifacts live, or where the artifacts will be built.|| |`ah_auto_approve`|`False`|no|Whether the collection will be automatically approved in Automation Hub. This will only work if the account being used has correct privileges.|| |`ah_overwrite_existing`|`False`|no|Whether the collection will be automatically overwrite an existing collection in Automation Hub. This will only work if the account being used has correct privileges.|| -|`ah_collections`|`see below`|no|Data structure describing your collections, mutually exclusive to ah_collection_list, described below.|| -|`ah_collection_list`|`list`|no|Data structure file paths to pre built collections, mutually exclusive with ah_collections.|| +|`hub_collections`|`see below`|no|Data structure describing your collections, mutually exclusive to ah_collection_list, described below.|| +|`ah_collection_list`|`list`|no|Data structure file paths to pre built collections, mutually exclusive with hub_collections.|| ### Secure Logging Variables The following Variables compliment each other. If Both variables are not set, secure logging defaults to false. The role defaults to False as normally the add publish collections task does not include sensitive information. -ah_configuration_publish_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. +hub_configuration_publish_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| -|`ah_configuration_publish_secure_logging`|`False`|no|Whether or not to include the sensitive publish collections role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| +|`hub_configuration_publish_secure_logging`|`False`|no|Whether or not to include the sensitive publish collections role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| |`aap_configuration_secure_logging`|`False`|no|This variable enables secure logging as well, but is shared across multiple roles, see above.| ### Asynchronous Retry Variables @@ -44,17 +44,17 @@ This also speeds up the overall role. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| |`aap_configuration_async_timeout`|1000|no|This variable sets the async timeout for the role globally.| -|`ah_configuration_publish_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| +|`hub_configuration_publish_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| |`aap_configuration_async_retries`|50|no|This variable sets the number of retries to attempt for the role globally.| -|`ah_configuration_publish_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| +|`hub_configuration_publish_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| |`aap_configuration_loop_delay`|1000|no|This variable sets the loop_delay for the role globally.| -|`ah_configuration_publish_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| +|`hub_configuration_publish_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| |`aap_configuration_async_delay`|1|no|This sets the delay between retries for the role globally.| -|`ah_configuration_publish_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| +|`hub_configuration_publish_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| ## Data Structure -### ah_collections Variables +### hub_collections Variables |Variable Name|Default Value|Required|Type|Description| |:---:|:---:|:---:|:---:|:---:| @@ -71,7 +71,7 @@ This also speeds up the overall role. ```yaml --- -ah_collections: +hub_collections: - collection_name: cisco.iosxr git_url: https://github.com/ansible-collections/cisco.iosxr diff --git a/roles/hub_publish/defaults/main.yml b/roles/hub_publish/defaults/main.yml index bba5aa20e..83b34ceb8 100644 --- a/roles/hub_publish/defaults/main.yml +++ b/roles/hub_publish/defaults/main.yml @@ -8,11 +8,11 @@ # These are the default variables specific to the license role -# The following two lists are mutually exclusive, you need to provide at least one of them, and ah_collections will override the collection list. +# The following two lists are mutually exclusive, you need to provide at least one of them, and hub_collections will override the collection list. # A list of paths to collection tarballs to publish if you are not cloning from a git and building them. # ah_collection_list: [] # a list of dictionaries describing collections to publish -# ah_collections: [] +# hub_collections: [] # possible fields: # - collection_name: "name of collection, normally the last part before the / in a git url" # mandatory # git_url: "url to git repo." # mandatory when type=git @@ -22,10 +22,10 @@ aap_configuration_working_dir: "/var/tmp" ah_auto_approve: false ah_overwrite_existing: false -ah_configuration_publish_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" -ah_configuration_publish_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" -ah_configuration_publish_async_retries: "{{ aap_configuration_async_retries | default(50) }}" -ah_configuration_publish_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" -ah_configuration_publish_async_delay: "{{ aap_configuration_async_delay | default(1) }}" +hub_configuration_publish_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" +hub_configuration_publish_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" +hub_configuration_publish_async_retries: "{{ aap_configuration_async_retries | default(50) }}" +hub_configuration_publish_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" +hub_configuration_publish_async_delay: "{{ aap_configuration_async_delay | default(1) }}" aap_configuration_async_dir: null ... diff --git a/roles/hub_publish/meta/argument_specs.yml b/roles/hub_publish/meta/argument_specs.yml index d2cb890ec..0714cc3ce 100644 --- a/roles/hub_publish/meta/argument_specs.yml +++ b/roles/hub_publish/meta/argument_specs.yml @@ -18,7 +18,7 @@ argument_specs: type: bool required: false description: Whether the collection will be automatically overwrite an existing collection in Automation Hub. This will only work if the account being used has correct privileges. - ah_collections: + hub_collections: default: [] required: false description: Data structure describing your collections, mutually exclusive to ah_collection_list @@ -27,12 +27,12 @@ argument_specs: ah_collection_list: default: [] required: false - description: Data structure file paths to pre built collections, mutually exclusive with ah_collections. + description: Data structure file paths to pre built collections, mutually exclusive with hub_collections. type: list elements: str # Async variables - ah_configuration_publish_async_retries: + hub_configuration_publish_async_retries: default: "{{ aap_configuration_async_retries | default(50) }}" required: false description: This variable sets the number of retries to attempt for the role. @@ -40,7 +40,7 @@ argument_specs: default: 50 required: false description: This variable sets number of retries across all roles as a default. - ah_configuration_publish_async_delay: + hub_configuration_publish_async_delay: default: "{{ aap_configuration_async_delay | default(1) }}" required: false description: This variable sets delay between retries for the role. @@ -54,7 +54,7 @@ argument_specs: description: Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`. # No_log variables - ah_configuration_publish_secure_logging: + hub_configuration_publish_secure_logging: default: "{{ aap_configuration_secure_logging | default(false) }}" required: false type: bool diff --git a/roles/hub_publish/tasks/main.yml b/roles/hub_publish/tasks/main.yml index 4dab4d4ef..a777d8ce6 100644 --- a/roles/hub_publish/tasks/main.yml +++ b/roles/hub_publish/tasks/main.yml @@ -6,11 +6,11 @@ version: "{{ __ah_collection_item.version | default(omit) }}" key_file: "{{ __ah_collection_item.key_path | default(omit) }}" ssh_opts: "{{ __ah_collection_item.ssh_opts | default(omit) }}" - loop: "{{ ah_collections }}" + loop: "{{ hub_collections }}" loop_control: loop_var: __ah_collection_item - pause: "{{ ah_configuration_publish_loop_delay }}" - no_log: "{{ ah_configuration_publish_secure_logging }}" + pause: "{{ hub_configuration_publish_loop_delay }}" + no_log: "{{ hub_configuration_publish_secure_logging }}" when: - ah_collection_list is not defined - __ah_collection_item.collection_local_path is not defined @@ -21,10 +21,10 @@ dest: "{{ aap_configuration_working_dir }}/{{ __ah_collection_item.collection_name }}" remote_src: true mode: "0755" - loop: "{{ ah_collections }}" + loop: "{{ hub_collections }}" loop_control: loop_var: __ah_collection_item - no_log: "{{ ah_configuration_publish_secure_logging }}" + no_log: "{{ hub_configuration_publish_secure_logging }}" when: - ah_collection_list is not defined - __ah_collection_item.collection_local_path is defined @@ -35,17 +35,17 @@ output_path: "{{ aap_configuration_working_dir }}/{{ __ah_collection_item.collection_name }}" force: true register: ah_build_results - loop: "{{ ah_collections }}" + loop: "{{ hub_collections }}" loop_control: loop_var: __ah_collection_item - no_log: "{{ ah_configuration_publish_secure_logging }}" + no_log: "{{ hub_configuration_publish_secure_logging }}" when: ah_collection_list is not defined - name: Find if variable contains file or dir ansible.builtin.stat: path: "{{ __ah_build_result_item.path }}" register: ah_build_stat_results - no_log: "{{ ah_configuration_publish_secure_logging }}" + no_log: "{{ hub_configuration_publish_secure_logging }}" loop: "{{ ah_build_results.results }}" loop_control: loop_var: __ah_build_result_item @@ -56,8 +56,8 @@ ansible.builtin.find: paths: "{{ (__ah_build_result_item.stat.isdir) | ternary(__ah_build_result_item.stat.path, (__ah_build_result_item.stat.path | dirname)) }}" patterns: "{{ (__ah_build_result_item.stat.isdir) | ternary('*.tar.gz', (__ah_build_result_item.stat.path | basename)) }}" - register: __ah_collections_find_results - no_log: "{{ ah_configuration_publish_secure_logging }}" + register: __hub_collections_find_results + no_log: "{{ hub_configuration_publish_secure_logging }}" loop: "{{ ah_build_stat_results.results }}" loop_control: loop_var: "__ah_build_result_item" @@ -65,8 +65,8 @@ - name: Set path for all collections found ansible.builtin.set_fact: - ah_collection_list: "{{ __ah_collections_find_results.results | map(attribute='files') | flatten | map(attribute='path') | flatten }}" - no_log: "{{ ah_configuration_publish_secure_logging }}" + ah_collection_list: "{{ __hub_collections_find_results.results | map(attribute='files') | flatten | map(attribute='path') | flatten }}" + no_log: "{{ hub_configuration_publish_secure_logging }}" when: ah_collection_list is not defined - name: Get token @@ -100,8 +100,8 @@ loop: "{{ ah_collection_list }}" loop_control: loop_var: "__ah_collection_file" - no_log: "{{ ah_configuration_publish_secure_logging }}" - async: "{{ ah_configuration_publish_async_timeout }}" + no_log: "{{ hub_configuration_publish_secure_logging }}" + async: "{{ hub_configuration_publish_async_timeout }}" poll: 0 register: __publish_job_async changed_when: not __publish_job_async.changed @@ -113,13 +113,13 @@ jid: "{{ __publish_job_async_result_item.ansible_job_id }}" register: __publish_job_async_result until: __publish_job_async_result.finished - retries: "{{ ah_configuration_publish_async_retries }}" - delay: "{{ ah_configuration_publish_async_delay }}" + retries: "{{ hub_configuration_publish_async_retries }}" + delay: "{{ hub_configuration_publish_async_delay }}" loop: "{{ __publish_job_async.results }}" loop_control: loop_var: __publish_job_async_result_item when: __publish_job_async_result_item.ansible_job_id is defined - no_log: "{{ ah_configuration_publish_secure_logging }}" + no_log: "{{ hub_configuration_publish_secure_logging }}" vars: ansible_async_dir: '{{ aap_configuration_async_dir }}' @@ -138,7 +138,7 @@ loop: "{{ ah_collection_list }}" loop_control: loop_var: "__ah_collection_file" - no_log: "{{ ah_configuration_publish_secure_logging }}" + no_log: "{{ hub_configuration_publish_secure_logging }}" when: not ah_auto_approve register: approval retries: 3 diff --git a/roles/hub_publish/tests/vars/collections.yml b/roles/hub_publish/tests/vars/collections.yml index af3dcacd1..5c38204bb 100644 --- a/roles/hub_publish/tests/vars/collections.yml +++ b/roles/hub_publish/tests/vars/collections.yml @@ -1,5 +1,5 @@ --- -ah_collections: +hub_collections: - collection_name: cisco.iosxr git_url: https://github.com/ansible-collections/cisco.iosxr - collection_local_path: /var/tmp/tower_configuration diff --git a/roles/hub_role/README.md b/roles/hub_role/README.md index 4ab6bfb6c..64daf0a26 100644 --- a/roles/hub_role/README.md +++ b/roles/hub_role/README.md @@ -15,18 +15,18 @@ An Ansible Role to create role permissions in Automation Hub. |`aap_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Galaxy or Automation Hub host.|| |`ah_path_prefix`|""|no|API path used to access the api. Either galaxy, automation-hub, or custom|| |`aap_configuration_async_dir`|`null`|no|Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`.|| -|`ah_roles`|`see below`|yes|Data structure describing your role permissions, described below.|| +|`hub_roles`|`see below`|yes|Data structure describing your role permissions, described below.|| ### Secure Logging Variables The following Variables compliment each other. If Both variables are not set, secure logging defaults to false. The role defaults to False as normally the add group task does not include sensitive information. -ah_configuration_group_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. +hub_configuration_group_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| -|`ah_configuration_role_secure_logging`|`False`|no|Whether or not to include the sensitive Namespace role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| +|`hub_configuration_role_secure_logging`|`False`|no|Whether or not to include the sensitive Namespace role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| |`aap_configuration_secure_logging`|`False`|no|This variable enables secure logging as well, but is shared across multiple roles, see above.| ### Asynchronous Retry Variables @@ -39,11 +39,11 @@ This also speeds up the overall role. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| |`aap_configuration_async_timeout`|1000|no|This variable sets the async timeout for the role globally.| -|`ah_configuration_role_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| +|`hub_configuration_role_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| |`aap_configuration_async_retries`|50|no|This variable sets the number of retries to attempt for the role globally.| -|`ah_configuration_role_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| +|`hub_configuration_role_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| |`aap_configuration_async_delay`|1|no|This sets the delay between retries for the role globally.| -|`ah_configuration_role_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| +|`hub_configuration_role_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| ## Data Structure @@ -83,7 +83,7 @@ The module accepts the following roles: ```yaml --- -ah_roles: +hub_roles: - name: galaxy.stuff.mcstuffins description: test perms: diff --git a/roles/hub_role/defaults/main.yml b/roles/hub_role/defaults/main.yml index a687bd4aa..edc729f7f 100644 --- a/roles/hub_role/defaults/main.yml +++ b/roles/hub_role/defaults/main.yml @@ -9,16 +9,16 @@ # These are the default variables specific to the license role # a list of dictionaries describing the Automation Hub groups -ah_roles: [] +hub_roles: [] # possible fields: # - name # - perms # - state -ah_configuration_role_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" -ah_configuration_role_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" -ah_configuration_role_async_retries: "{{ aap_configuration_async_retries | default(50) }}" -ah_configuration_role_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" -ah_configuration_role_async_delay: "{{ aap_configuration_async_delay | default(1) }}" +hub_configuration_role_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" +hub_configuration_role_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" +hub_configuration_role_async_retries: "{{ aap_configuration_async_retries | default(50) }}" +hub_configuration_role_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" +hub_configuration_role_async_delay: "{{ aap_configuration_async_delay | default(1) }}" aap_configuration_async_dir: null ... diff --git a/roles/hub_role/meta/argument_specs.yml b/roles/hub_role/meta/argument_specs.yml index c45914e3a..24c639499 100644 --- a/roles/hub_role/meta/argument_specs.yml +++ b/roles/hub_role/meta/argument_specs.yml @@ -3,7 +3,7 @@ argument_specs: main: short_description: An Ansible Role to create role permissions in Automation Hub. options: - ah_roles: + hub_roles: default: [] required: false description: Data structure describing your role permissions to manage. @@ -11,7 +11,7 @@ argument_specs: elements: dict # Async variables - ah_configuration_role_async_retries: + hub_configuration_role_async_retries: default: "{{ aap_configuration_async_retries | default(50) }}" required: false description: This variable sets the number of retries to attempt for the role. @@ -19,7 +19,7 @@ argument_specs: default: 50 required: false description: This variable sets number of retries across all roles as a default. - ah_configuration_role_async_delay: + hub_configuration_role_async_delay: default: "{{ aap_configuration_async_delay | default(1) }}" required: false description: This variable sets delay between retries for the role. @@ -33,7 +33,7 @@ argument_specs: description: Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`. # No_log variables - ah_configuration_role_secure_logging: + hub_configuration_role_secure_logging: default: "{{ aap_configuration_secure_logging | default(false) }}" required: false type: bool diff --git a/roles/hub_role/tasks/main.yml b/roles/hub_role/tasks/main.yml index 02581e9b6..0f9d2342f 100644 --- a/roles/hub_role/tasks/main.yml +++ b/roles/hub_role/tasks/main.yml @@ -13,13 +13,13 @@ ah_path_prefix: "{{ ah_path_prefix | default(omit) }}" validate_certs: "{{ aap_validate_certs | default(omit) }}" request_timeout: "{{ aap_request_timeout | default(omit) }}" - loop: "{{ ah_roles }}" + loop: "{{ hub_roles }}" loop_control: loop_var: __hub_role_item label: "{{ __operation.verb }} the Role {{ __hub_role_item.name }} to Hub" - pause: "{{ ah_configuration_role_loop_delay }}" - no_log: "{{ ah_configuration_role_secure_logging }}" - async: "{{ ah_configuration_role_async_timeout }}" + pause: "{{ hub_configuration_role_loop_delay }}" + no_log: "{{ hub_configuration_role_secure_logging }}" + async: "{{ hub_configuration_role_async_timeout }}" poll: 0 register: __roles_job_async changed_when: not __roles_job_async.changed @@ -32,14 +32,14 @@ jid: "{{ __roles_job_async_result_item.ansible_job_id }}" register: __roles_job_async_result until: __roles_job_async_result.finished - retries: "{{ ah_configuration_role_async_retries }}" - delay: "{{ ah_configuration_role_async_delay }}" + retries: "{{ hub_configuration_role_async_retries }}" + delay: "{{ hub_configuration_role_async_delay }}" loop: "{{ __roles_job_async.results }}" loop_control: loop_var: __roles_job_async_result_item label: "{{ __operation.verb }} Role {{ __roles_job_async_result_item.__hub_role_item.name }} | Wait for finish the Role {{ __operation.action }}" when: __roles_job_async_result_item.ansible_job_id is defined - no_log: "{{ ah_configuration_role_secure_logging }}" + no_log: "{{ hub_configuration_role_secure_logging }}" vars: __operation: "{{ operation_translate[__roles_job_async_result_item.state | default(platform_state) | default('present')] }}" ansible_async_dir: '{{ aap_configuration_async_dir }}' diff --git a/roles/hub_role/tests/vars/roles.yml b/roles/hub_role/tests/vars/roles.yml index e3d619e70..99743f8b6 100644 --- a/roles/hub_role/tests/vars/roles.yml +++ b/roles/hub_role/tests/vars/roles.yml @@ -1,5 +1,5 @@ --- -ah_roles: +hub_roles: - name: galaxy.stuff.mcstuffins description: test perms: diff --git a/roles/hub_user/README.md b/roles/hub_user/README.md index a4f5321cc..5bbf97564 100644 --- a/roles/hub_user/README.md +++ b/roles/hub_user/README.md @@ -22,11 +22,11 @@ An Ansible Role to create users in Automation Hub. The following Variables compliment each other. If Both variables are not set, secure logging defaults to false. The role defaults to False as normally the add user task does not include sensitive information. -ah_configuration_user_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. +hub_configuration_user_secure_logging defaults to the value of aap_configuration_secure_logging if it is not explicitly called. This allows for secure logging to be toggled for the entire suite of automation hub configuration roles with a single variable, or for the user to selectively use it. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| -|`ah_configuration_user_secure_logging`|`False`|no|Whether or not to include the sensitive Namespace role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| +|`hub_configuration_user_secure_logging`|`False`|no|Whether or not to include the sensitive Namespace role tasks in the log. Set this value to `True` if you will be providing your sensitive values from elsewhere.| |`aap_configuration_secure_logging`|`False`|no|This variable enables secure logging as well, but is shared across multiple roles, see above.| ### Asynchronous Retry Variables @@ -39,13 +39,13 @@ This also speeds up the overall role. |Variable Name|Default Value|Required|Description| |:---:|:---:|:---:|:---:| |`aap_configuration_async_timeout`|1000|no|This variable sets the async timeout for the role globally.| -|`ah_configuration_user_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| +|`hub_configuration_user_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.| |`aap_configuration_async_retries`|50|no|This variable sets the number of retries to attempt for the role globally.| -|`ah_configuration_user_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| +|`hub_configuration_user_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.| |`aap_configuration_loop_delay`|1000|no|This variable sets the loop_delay for the role globally.| -|`ah_configuration_user_accounts_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| +|`hub_configuration_user_accounts_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.| |`aap_configuration_async_delay`|1|no|This sets the delay between retries for the role globally.| -|`ah_configuration_user_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| +|`hub_configuration_user_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.| ## Data Structure diff --git a/roles/hub_user/defaults/main.yml b/roles/hub_user/defaults/main.yml index 973235d84..5b6634e2f 100644 --- a/roles/hub_user/defaults/main.yml +++ b/roles/hub_user/defaults/main.yml @@ -21,10 +21,10 @@ aap_user_accounts: [] # - password # - state -ah_configuration_user_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" -ah_configuration_user_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" -ah_configuration_user_async_retries: "{{ aap_configuration_async_retries | default(50) }}" -ah_configuration_user_accounts_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" -ah_configuration_user_async_delay: "{{ aap_configuration_async_delay | default(1) }}" +hub_configuration_user_secure_logging: "{{ aap_configuration_secure_logging | default(false) }}" +hub_configuration_user_async_timeout: "{{ aap_configuration_async_timeout | default(1000) }}" +hub_configuration_user_async_retries: "{{ aap_configuration_async_retries | default(50) }}" +hub_configuration_user_accounts_loop_delay: "{{ aap_configuration_loop_delay | default(0) }}" +hub_configuration_user_async_delay: "{{ aap_configuration_async_delay | default(1) }}" aap_configuration_async_dir: null ... diff --git a/roles/hub_user/meta/argument_specs.yml b/roles/hub_user/meta/argument_specs.yml index 4cf547ed7..0ce1ff31c 100644 --- a/roles/hub_user/meta/argument_specs.yml +++ b/roles/hub_user/meta/argument_specs.yml @@ -11,7 +11,7 @@ argument_specs: elements: dict # Async variables - ah_configuration_user_async_retries: + hub_configuration_user_async_retries: default: "{{ aap_configuration_async_retries | default(50) }}" required: false description: This variable sets the number of retries to attempt for the role. @@ -19,7 +19,7 @@ argument_specs: default: 50 required: false description: This variable sets number of retries across all roles as a default. - ah_configuration_user_async_delay: + hub_configuration_user_async_delay: default: "{{ aap_configuration_async_delay | default(1) }}" required: false description: This variable sets delay between retries for the role. @@ -33,7 +33,7 @@ argument_specs: description: Sets the directory to write the results file for async tasks. The default value is set to `null` which uses the Ansible Default of `/root/.ansible_async/`. # No_log variables - ah_configuration_user_secure_logging: + hub_configuration_user_secure_logging: default: "{{ aap_configuration_secure_logging | default(false) }}" required: false type: bool diff --git a/roles/hub_user/tasks/main.yml b/roles/hub_user/tasks/main.yml index 8470b74ec..ee414c5d6 100644 --- a/roles/hub_user/tasks/main.yml +++ b/roles/hub_user/tasks/main.yml @@ -23,9 +23,9 @@ loop_control: loop_var: __hub_user_item label: "{{ __operation.verb }} the user {{ __hub_user_item.username }} to Hub" - pause: "{{ ah_configuration_user_accounts_loop_delay }}" - no_log: "{{ ah_configuration_user_secure_logging }}" - async: "{{ ah_configuration_user_async_timeout }}" + pause: "{{ hub_configuration_user_accounts_loop_delay }}" + no_log: "{{ hub_configuration_user_secure_logging }}" + async: "{{ hub_configuration_user_async_timeout }}" poll: 0 register: __users_job_async changed_when: not __users_job_async.changed @@ -38,14 +38,14 @@ jid: "{{ __users_job_async_result_item.ansible_job_id }}" register: __users_job_async_result until: __users_job_async_result.finished - retries: "{{ ah_configuration_user_async_retries }}" - delay: "{{ ah_configuration_user_async_delay }}" + retries: "{{ hub_configuration_user_async_retries }}" + delay: "{{ hub_configuration_user_async_delay }}" loop: "{{ __users_job_async.results }}" loop_control: loop_var: __users_job_async_result_item label: "{{ __operation.verb }} User {{ __users_job_async_result_item.__hub_user_item.username }} | Wait for finish the User {{ __operation.action }}" when: __users_job_async_result_item.ansible_job_id is defined - no_log: "{{ ah_configuration_user_secure_logging }}" + no_log: "{{ hub_configuration_user_secure_logging }}" vars: __operation: "{{ operation_translate[__users_job_async_result_item.state | default(platform_state) | default('present')] }}" ansible_async_dir: '{{ aap_configuration_async_dir }}' diff --git a/tests/configs/hub/ah_auth.yml b/tests/configs/hub/ah_auth.yml index f74f6c170..0be29f69e 100644 --- a/tests/configs/hub/ah_auth.yml +++ b/tests/configs/hub/ah_auth.yml @@ -9,5 +9,5 @@ # aap_password: admin aap_validate_certs: false ah_path_prefix: 'galaxy' # AH: galaxy Galaxy: automation-hub -ah_configuration_namespace_secure_logging: false +hub_configuration_namespace_secure_logging: false ... diff --git a/tests/configs/hub/ah_collections.yml b/tests/configs/hub/ah_collections.yml index 06f02a151..c11f397ac 100644 --- a/tests/configs/hub/ah_collections.yml +++ b/tests/configs/hub/ah_collections.yml @@ -1,5 +1,5 @@ --- -ah_collections: +hub_collections: - namespace: infra name: galaxy path: "/home/runner/work/{{ git_repo_name }}/{{ git_repo_name }}/infra-aap_configuration-1.0.0.tar.gz" @@ -15,7 +15,7 @@ ah_collections: auto_approve: true timeout: 180 -ah_collections_overwrite: +hub_collections_overwrite: - namespace: infra name: galaxy path: "/home/runner/work/{{ git_repo_name }}/{{ git_repo_name }}/infra-aap_configuration-1.0.0.tar.gz" @@ -25,7 +25,7 @@ ah_collections_overwrite: timeout: 180 overwrite_existing: true -ah_collections_delete: +hub_collections_delete: - namespace: galaxy name: galaxy state: absent @@ -34,7 +34,7 @@ ah_git_collections: - collection_name: collection_test git_url: https://github.com/sean-m-sullivan/collection_test -ansible_config_path: "{{ ah_configuration_working_dir }}/ansible.cfg" -ah_configuration_collection_async_retries: 100 -ah_configuration_collection_async_delay: 10 +ansible_config_path: "{{ hub_configuration_working_dir }}/ansible.cfg" +hub_configuration_collection_async_retries: 100 +hub_configuration_collection_async_delay: 10 ... diff --git a/tests/configs/hub/ah_ee_images.yml b/tests/configs/hub/ah_ee_images.yml index eca164088..81ec2dd3b 100644 --- a/tests/configs/hub/ah_ee_images.yml +++ b/tests/configs/hub/ah_ee_images.yml @@ -1,5 +1,5 @@ --- -ah_ee_images: +hub_ee_images: - name: config_as_code_ee state: present append: false diff --git a/tests/configs/hub/ah_ee_repositories.yml b/tests/configs/hub/ah_ee_repositories.yml index 90de4a1a1..510791ba7 100644 --- a/tests/configs/hub/ah_ee_repositories.yml +++ b/tests/configs/hub/ah_ee_repositories.yml @@ -1,6 +1,6 @@ --- -ah_configuration_ee_registry_sync_async_delay: 20 -ah_ee_registries: +hub_configuration_ee_registry_sync_async_delay: 20 +hub_ee_registries: - name: quay url: https://quay.io/ rate_limit: 100 @@ -17,7 +17,7 @@ ah_ee_registries: tls_validation: false interval: 20 timeout: 1100 -ah_ee_repositories: +hub_ee_repositories: # Adding a Remote repository - name: config_as_code_ee description: The infra config as code official EE diff --git a/tests/configs/hub/ah_group_roles.yml b/tests/configs/hub/ah_group_roles.yml index f120c4375..58b76fedc 100644 --- a/tests/configs/hub/ah_group_roles.yml +++ b/tests/configs/hub/ah_group_roles.yml @@ -1,5 +1,5 @@ --- -ah_group_roles: +hub_group_roles: - state: present groups: - santa diff --git a/tests/configs/hub/ah_namespaces.yml b/tests/configs/hub/ah_namespaces.yml index 20cfe776b..a0f40880a 100644 --- a/tests/configs/hub/ah_namespaces.yml +++ b/tests/configs/hub/ah_namespaces.yml @@ -1,5 +1,5 @@ --- -ah_namespaces: +hub_namespaces: - name: community_test company: Community Test email: user@example.com diff --git a/tests/configs/hub/ah_repository.yml b/tests/configs/hub/ah_repository.yml index 54c585645..c5933c4e2 100644 --- a/tests/configs/hub/ah_repository.yml +++ b/tests/configs/hub/ah_repository.yml @@ -1,6 +1,6 @@ --- -ah_configuration_repository_sync_async_delay: 5 -ah_configuration_repository_sync_async_retries: 150 +hub_configuration_repository_sync_async_delay: 5 +hub_configuration_repository_sync_async_retries: 150 ah_repositories: - name: community url: https://beta-galaxy.ansible.com/ @@ -12,18 +12,18 @@ ah_repositories: timeout: 1000000 # newer version -ah_configuration_collection_repository_async_delay: 5 -ah_configuration_collection_repository_async_retries: 150 -ah_configuration_collection_repository_sync_async_delay: 5 -ah_configuration_collection_repository_sync_async_retries: 150 -ah_collection_remotes: +hub_configuration_collection_repository_async_delay: 5 +hub_configuration_collection_repository_async_retries: 150 +hub_configuration_collection_repository_sync_async_delay: 5 +hub_configuration_collection_repository_sync_async_retries: 150 +hub_collection_remotes: - name: community-infra url: https://beta-galaxy.ansible.com/ requirements: - name: infra.ee_utilities - name: infra.controller_configuration -ah_collection_repositories: +hub_collection_repositories: - name: community-infra-repo description: "description of community-infra repository" pulp_labels: diff --git a/tests/configs/hub/ah_roles.yml b/tests/configs/hub/ah_roles.yml index c4055da81..fd7e55dd9 100644 --- a/tests/configs/hub/ah_roles.yml +++ b/tests/configs/hub/ah_roles.yml @@ -1,5 +1,5 @@ --- -ah_roles: +hub_roles: - name: galaxy.stuff.mcstuffins description: test perms: