Skip to content

Commit 7254f2e

Browse files
djdanielssondjdanielsson
authored
renaming some missed hub_vars (#968)
* modified: CONVERSION_GUIDE.md new file: changelogs/fragments/hub_vars.yml modified: galaxy.yml modified: roles/dispatch/README.md modified: roles/dispatch/defaults/main.yml modified: roles/dispatch/meta/argument_specs.yml modified: roles/dispatch/tests/configs/images.yml modified: roles/dispatch/tests/configs/registries.yml modified: roles/dispatch/tests/configs/repositories.yml modified: roles/hub_collection/README.md modified: roles/hub_collection/defaults/main.yml modified: roles/hub_collection/meta/argument_specs.yml modified: roles/hub_collection/tasks/main.yml modified: roles/hub_collection_remote/README.md modified: roles/hub_collection_remote/meta/argument_specs.yml modified: roles/hub_collection_remote/tasks/main.yml modified: roles/hub_collection_remote/tests/vars/repositories.yml modified: roles/hub_collection_repository/README.md modified: roles/hub_collection_repository/meta/argument_specs.yml modified: roles/hub_collection_repository/tasks/main.yml modified: roles/hub_collection_repository/tests/vars/repositories.yml modified: roles/hub_collection_repository_sync/README.md modified: roles/hub_collection_repository_sync/meta/argument_specs.yml modified: roles/hub_collection_repository_sync/tasks/main.yml modified: roles/hub_collection_repository_sync/tests/vars/repositories.yml modified: roles/hub_ee_image/README.md modified: roles/hub_ee_image/defaults/main.yml modified: roles/hub_ee_image/meta/argument_specs.yml modified: roles/hub_ee_image/tasks/main.yml modified: roles/hub_ee_image/tests/vars/ee_images.yml modified: roles/hub_ee_registry/README.md modified: roles/hub_ee_registry/defaults/main.yml modified: roles/hub_ee_registry/meta/argument_specs.yml modified: roles/hub_ee_registry/tasks/main.yml modified: roles/hub_ee_registry/tests/vars/ee_registries.yml modified: roles/hub_ee_registry_index/README.md modified: roles/hub_ee_registry_index/defaults/main.yml modified: roles/hub_ee_registry_index/meta/argument_specs.yml modified: roles/hub_ee_registry_index/tasks/main.yml modified: roles/hub_ee_registry_index/tests/vars/ee_registries.yml modified: roles/hub_ee_registry_sync/README.md modified: roles/hub_ee_registry_sync/defaults/main.yml modified: roles/hub_ee_registry_sync/meta/argument_specs.yml modified: roles/hub_ee_registry_sync/tasks/main.yml modified: roles/hub_ee_registry_sync/tests/vars/ee_registries.yml modified: roles/hub_ee_repository/README.md modified: roles/hub_ee_repository/defaults/main.yml modified: roles/hub_ee_repository/meta/argument_specs.yml modified: roles/hub_ee_repository/tasks/main.yml modified: roles/hub_ee_repository/tests/vars/ee_repositories.yml modified: roles/hub_ee_repository_sync/README.md modified: roles/hub_ee_repository_sync/defaults/main.yml modified: roles/hub_ee_repository_sync/meta/argument_specs.yml modified: roles/hub_ee_repository_sync/tasks/main.yml modified: roles/hub_ee_repository_sync/tests/vars/ee_repositories.yml modified: roles/hub_group_roles/README.md modified: roles/hub_group_roles/defaults/main.yml modified: roles/hub_group_roles/meta/argument_specs.yml modified: roles/hub_group_roles/tasks/main.yml modified: roles/hub_group_roles/tests/vars/group_roles.yml modified: roles/hub_namespace/README.md modified: roles/hub_namespace/defaults/main.yml modified: roles/hub_namespace/meta/argument_specs.yml modified: roles/hub_namespace/tasks/main.yml modified: roles/hub_namespace/tests/vars/namespaces.yml modified: roles/hub_publish/README.md modified: roles/hub_publish/defaults/main.yml modified: roles/hub_publish/meta/argument_specs.yml modified: roles/hub_publish/tasks/main.yml modified: roles/hub_publish/tests/vars/collections.yml modified: roles/hub_role/README.md modified: roles/hub_role/defaults/main.yml modified: roles/hub_role/meta/argument_specs.yml modified: roles/hub_role/tasks/main.yml modified: roles/hub_role/tests/vars/roles.yml modified: tests/configs/hub/ah_collections.yml modified: tests/configs/hub/ah_ee_images.yml modified: tests/configs/hub/ah_ee_repositories.yml modified: tests/configs/hub/ah_group_roles.yml modified: tests/configs/hub/ah_namespaces.yml modified: tests/configs/hub/ah_repository.yml modified: tests/configs/hub/ah_roles.yml * modified: roles/dispatch/README.md modified: roles/dispatch/defaults/main.yml modified: roles/dispatch/meta/argument_specs.yml modified: roles/hub_ee_repository_sync/tasks/main.yml * modified: roles/dispatch/README.md modified: roles/dispatch/defaults/main.yml modified: roles/dispatch/meta/argument_specs.yml * modified: roles/hub_ee_repository_sync/tasks/main.yml * modified: CONVERSION_GUIDE.md modified: roles/hub_collection/README.md modified: roles/hub_collection/defaults/main.yml modified: roles/hub_collection/meta/argument_specs.yml modified: roles/hub_collection/tasks/main.yml modified: roles/hub_collection_remote/README.md modified: roles/hub_collection_remote/defaults/main.yml modified: roles/hub_collection_remote/meta/argument_specs.yml modified: roles/hub_collection_remote/tasks/main.yml modified: roles/hub_collection_repository/README.md modified: roles/hub_collection_repository/defaults/main.yml modified: roles/hub_collection_repository/meta/argument_specs.yml modified: roles/hub_collection_repository/tasks/main.yml modified: roles/hub_collection_repository_sync/README.md modified: roles/hub_collection_repository_sync/defaults/main.yml modified: roles/hub_collection_repository_sync/meta/argument_specs.yml modified: roles/hub_collection_repository_sync/tasks/main.yml modified: roles/hub_ee_image/README.md modified: roles/hub_ee_image/defaults/main.yml modified: roles/hub_ee_image/meta/argument_specs.yml modified: roles/hub_ee_image/tasks/main.yml modified: roles/hub_ee_registry/README.md modified: roles/hub_ee_registry/defaults/main.yml modified: roles/hub_ee_registry/meta/argument_specs.yml modified: roles/hub_ee_registry/tasks/main.yml modified: roles/hub_ee_registry_index/README.md modified: roles/hub_ee_registry_index/defaults/main.yml modified: roles/hub_ee_registry_index/meta/argument_specs.yml modified: roles/hub_ee_registry_index/tasks/main.yml modified: roles/hub_ee_registry_sync/README.md modified: roles/hub_ee_registry_sync/defaults/main.yml modified: roles/hub_ee_registry_sync/meta/argument_specs.yml modified: roles/hub_ee_registry_sync/tasks/main.yml modified: roles/hub_ee_repository/README.md modified: roles/hub_ee_repository/defaults/main.yml modified: roles/hub_ee_repository/meta/argument_specs.yml modified: roles/hub_ee_repository/tasks/main.yml modified: roles/hub_ee_repository_sync/README.md modified: roles/hub_ee_repository_sync/defaults/main.yml modified: roles/hub_ee_repository_sync/meta/argument_specs.yml modified: roles/hub_ee_repository_sync/tasks/main.yml modified: roles/hub_group/README.md modified: roles/hub_group/defaults/main.yml modified: roles/hub_group/meta/argument_specs.yml modified: roles/hub_group/tasks/main.yml modified: roles/hub_group_roles/README.md modified: roles/hub_group_roles/defaults/main.yml modified: roles/hub_group_roles/meta/argument_specs.yml modified: roles/hub_group_roles/tasks/main.yml modified: roles/hub_namespace/README.md modified: roles/hub_namespace/defaults/main.yml modified: roles/hub_namespace/meta/argument_specs.yml modified: roles/hub_namespace/tasks/main.yml modified: roles/hub_publish/README.md modified: roles/hub_publish/defaults/main.yml modified: roles/hub_publish/meta/argument_specs.yml modified: roles/hub_publish/tasks/main.yml modified: roles/hub_role/README.md modified: roles/hub_role/defaults/main.yml modified: roles/hub_role/meta/argument_specs.yml modified: roles/hub_role/tasks/main.yml modified: roles/hub_user/README.md modified: roles/hub_user/defaults/main.yml modified: roles/hub_user/meta/argument_specs.yml modified: roles/hub_user/tasks/main.yml modified: tests/configs/hub/ah_auth.yml modified: tests/configs/hub/ah_collections.yml modified: tests/configs/hub/ah_ee_repositories.yml modified: tests/configs/hub/ah_repository.yml
1 parent 69d60d9 commit 7254f2e

File tree

94 files changed

+513
-507
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+513
-507
lines changed

‎CONVERSION_GUIDE.md‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,15 @@ ah_configuration vars:
8686

8787
- aap_teams <- ah_groups
8888
- aap_user_accounts <- ah_users
89-
- ah_namespaces
90-
- ah_collections
91-
- ah_ee_registries
92-
- ah_ee_repositories
93-
- ah_ee_images
94-
- ah_collection_remotes
95-
- ah_collection_repositories
89+
- hub_namespaces <- ah_namespaces
90+
- hub_collections <- ah_collections
91+
- hub_ee_registries <- ah_ee_registries
92+
- hub_ee_repositories <- ah_ee_repositories
93+
- hub_ee_images <- ah_ee_images
94+
- hub_collection_remotes <- ah_collection_remotes
95+
- hub_collection_repositories <- ah_collection_repositories
96+
- hub_group_roles <- ah_group_roles
97+
- hub_roles <- ah_roles
9698

9799
controller_configuration vars:
98100

@@ -175,7 +177,7 @@ controller_configuration_projects_loop_delay
175177
however
176178
ah_configuration_collection_repository_async_delay
177179
is now
178-
ah_configuration_collection_repository_loop_delay
180+
hub_configuration_collection_repository_loop_delay
179181

180182
These are the following global variables:
181183

@@ -204,7 +206,7 @@ Format:
204206
- `prefix`+`role_name`+`_loop_delay`
205207
- `prefix`+`role_name`+`_async_dir`
206208

207-
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.
209+
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.
208210

209211
## Dispatch changes
210212

‎changelogs/fragments/hub_vars.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
major_changes:
3+
- renamed some more vars that got missed in the new naming convention.
4+
...

‎galaxy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
namespace: infra
33
name: aap_configuration
4-
version: 3.0.0
4+
version: 3.1.0
55
description: A collection of roles to manage Ansible Controller
66
readme: README.md
77
authors:

‎roles/dispatch/README.md‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ This is a meta role, its purpose is to run the other roles in the collection, it
1111
```yaml
1212
aap_configuration_dispatcher_roles: >
1313
{{ gateway_configuration_dispatcher_roles
14-
+ ah_configuration_dispatcher_roles
14+
+ hub_configuration_dispatcher_roles
1515
+ controller_configuration_dispatcher_roles
1616
+ eda_configuration_dispatcher_roles
1717
}}
@@ -70,42 +70,42 @@ gateway_configuration_dispatcher_roles:
7070
#### Hub Roles
7171
7272
```yaml
73-
ah_configuration_dispatcher_roles:
73+
hub_configuration_dispatcher_roles:
7474
- role: hub_namespace
75-
var: ah_namespaces
75+
var: hub_namespaces
7676
tags: namespaces
7777
- role: hub_collection
78-
var: ah_collections
78+
var: hub_collections
7979
tags: collections
8080
- role: hub_ee_registry
81-
var: ah_ee_registries
81+
var: hub_ee_registries
8282
tags: registries
8383
- role: hub_ee_repository
84-
var: ah_ee_repositories
84+
var: hub_ee_repositories
8585
tags: repos
8686
- role: hub_ee_repository_sync
87-
var: ah_ee_repository_sync
87+
var: hub_ee_repository_sync
8888
tags: reposync
8989
- role: hub_ee_image
90-
var: ah_ee_images
90+
var: hub_ee_images
9191
tags: images
9292
- role: hub_ee_registry
93-
var: ah_ee_registries
93+
var: hub_ee_registries
9494
tags: registry
9595
- role: hub_ee_registry_index
96-
var: ah_ee_registries
96+
var: hub_ee_registries
9797
tags: ee_indices
9898
- role: hub_ee_registry_sync
99-
var: ah_ee_registries
99+
var: hub_ee_registries
100100
tags: regsync
101101
- role: hub_collection_remote
102-
var: ah_collection_remotes
102+
var: hub_collection_remotes
103103
tags: collectionremote
104104
- role: hub_collection_repository
105-
var: ah_collection_repositories
105+
var: hub_collection_repositories
106106
tags: collectionsrep
107107
- role: hub_collection_repository_sync
108-
var: ah_collection_repositories
108+
var: hub_collection_repositories
109109
tags: collectionsrepsync
110110
```
111111

‎roles/dispatch/defaults/main.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -43,42 +43,42 @@ gateway_configuration_dispatcher_roles:
4343
var: aap_user_accounts
4444
tags: teams
4545

46-
ah_configuration_dispatcher_roles:
46+
hub_configuration_dispatcher_roles:
4747
- role: hub_namespace
48-
var: ah_namespaces
48+
var: hub_namespaces
4949
tags: namespaces
5050
- role: hub_collection
51-
var: ah_collections
51+
var: hub_collections
5252
tags: collections
5353
- role: hub_ee_registry
54-
var: ah_ee_registries
54+
var: hub_ee_registries
5555
tags: registries
5656
- role: hub_ee_repository
57-
var: ah_ee_repositories
57+
var: hub_ee_repositories
5858
tags: repos
5959
- role: hub_ee_repository_sync
60-
var: ah_ee_repository_sync
60+
var: hub_ee_repository_sync
6161
tags: reposync
6262
- role: hub_ee_image
63-
var: ah_ee_images
63+
var: hub_ee_images
6464
tags: images
6565
- role: hub_ee_registry
66-
var: ah_ee_registries
66+
var: hub_ee_registries
6767
tags: registry
6868
- role: hub_ee_registry_index
69-
var: ah_ee_registries
69+
var: hub_ee_registries
7070
tags: ee_indices
7171
- role: hub_ee_registry_sync
72-
var: ah_ee_registries
72+
var: hub_ee_registries
7373
tags: regsync
7474
- role: hub_collection_remote
75-
var: ah_collection_remotes
75+
var: hub_collection_remotes
7676
tags: collectionremote
7777
- role: hub_collection_repository
78-
var: ah_collection_repositories
78+
var: hub_collection_repositories
7979
tags: collectionsrep
8080
- role: hub_collection_repository_sync
81-
var: ah_collection_repositories
81+
var: hub_collection_repositories
8282
tags: collectionsrepsync
8383

8484
controller_configuration_dispatcher_roles:
@@ -191,7 +191,7 @@ eda_configuration_dispatcher_roles:
191191

192192
aap_configuration_dispatcher_roles: >
193193
{{ gateway_configuration_dispatcher_roles
194-
+ ah_configuration_dispatcher_roles
194+
+ hub_configuration_dispatcher_roles
195195
+ controller_configuration_dispatcher_roles
196196
+ eda_configuration_dispatcher_roles
197197
}}

‎roles/dispatch/meta/argument_specs.yml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -112,49 +112,49 @@ argument_specs:
112112
- role: controller_workflow_launch
113113
var: controller_workflow_launch_jobs
114114
tags: workflow_launch
115-
ah_configuration_dispatcher_roles:
115+
hub_configuration_dispatcher_roles:
116116
default:
117-
- role: pah_group
118-
var: ah_groups
117+
- role: hub_group
118+
var: aap_teams
119119
tags: groups
120-
- role: pah_user
120+
- role: hub_user
121121
var: aap_user_accounts
122122
tags: users
123-
- role: pah_namespace
124-
var: ah_namespaces
123+
- role: hub_namespace
124+
var: hub_namespaces
125125
tags: namespaces
126-
- role: pah_collection
127-
var: ah_collections
126+
- role: hub_collection
127+
var: hub_collections
128128
tags: collections
129-
- role: pah_ee_registry
130-
var: ah_ee_registries
129+
- role: hub_ee_registry
130+
var: hub_ee_registries
131131
tags: registries
132-
- role: pah_ee_repository
133-
var: ah_ee_repositories
132+
- role: hub_ee_repository
133+
var: hub_ee_repositories
134134
tags: repos
135-
- role: pah_ee_repository_sync
136-
var: ah_ee_repository_sync
135+
- role: phub_ee_repository_sync
136+
var: hub_ee_repository_sync
137137
tags: reposync
138-
- role: pah_ee_image
139-
var: ah_ee_images
138+
- role: hub_ee_image
139+
var: hub_ee_images
140140
tags: images
141-
- role: pah_ee_registry_index
142-
var: ah_ee_registries
141+
- role: hub_ee_registry_index
142+
var: hub_ee_registries
143143
tags: indices
144-
- role: pah_ee_registry_sync
145-
var: ah_ee_registries
144+
- role: hub_ee_registry_sync
145+
var: hub_ee_registries
146146
tags: regsync
147-
- role: pah_collection_remote
148-
var: ah_collection_remotes
147+
- role: hub_collection_remote
148+
var: hub_collection_remotes
149149
tags: collectionremote
150-
- role: pah_collection_repository
151-
var: ah_collection_repositories
150+
- role: hub_collection_repository
151+
var: hub_collection_repositories
152152
tags: collectionsrep
153-
- role: pah_collection_repository_sync
154-
var: ah_collection_repositories
153+
- role: hub_collection_repository_sync
154+
var: hub_collection_repositories
155155
tags: collectionsrepsync
156-
- role: pah_group_roles
157-
var: ah_group_roles
156+
- role: hub_group_roles
157+
var: hub_group_roles
158158
tags: group_roles
159159
eda_configuration_dispatcher_roles:
160160
default:

‎roles/dispatch/tests/configs/images.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
ah_ee_images:
2+
hub_ee_images:
33
- name: ansible-automation-platform-22-early-access/ee-supported-rhel8:2.0.0-15
44
state: present
55
append: false

‎roles/dispatch/tests/configs/registries.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
ah_ee_registries:
2+
hub_ee_registries:
33
- name: registry.redhat
44
url: registry.redhat.io
55
username: myuser

‎roles/dispatch/tests/configs/repositories.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
ah_ee_repositories:
2+
hub_ee_repositories:
33
- name: abc123
44
description: string
55
readme: "# My EE repository"

‎roles/hub_collection/README.md‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ An Ansible Role to update, or destroy Automation Hub Collections.
1515
|`aap_request_timeout`|`10`|no|Specify the timeout Ansible should use in requests to the Galaxy or Automation Hub host.||
1616
|`ah_path_prefix`|""|no|API path used to access the api. Either galaxy, automation-hub, or custom||
1717
|`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/`.||
18-
|`ah_collections`|`see below`|yes|Data structure describing your collections, described below.||
18+
|`hub_collections`|`see below`|yes|Data structure describing your collections, described below.||
1919

20-
These are the sub options for the vars `ah_collections` which are dictionaries with the options you want. See examples for details.
20+
These are the sub options for the vars `hub_collections` which are dictionaries with the options you want. See examples for details.
2121

2222
|Variable Name|Default Value|Required|Description|Example|
2323
|:---:|:---:|:---:|:---:|:---:|
@@ -45,24 +45,24 @@ This also speeds up the overall role.
4545
|Variable Name|Default Value|Required|Description|
4646
|:---:|:---:|:---:|:---:|
4747
|`aap_configuration_async_timeout`|1000|no|This variable sets the async timeout for the role globally.|
48-
|`ah_configuration_collection_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.|
48+
|`hub_configuration_collection_async_timeout`|`aap_configuration_async_timeout`|no|This variable sets the async timeout for the role.|
4949
|`aap_configuration_async_retries`|50|no|This variable sets the number of retries to attempt for the role globally.|
50-
|`ah_configuration_collection_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.|
50+
|`hub_configuration_collection_async_retries`|`aap_configuration_async_retries`|no|This variable sets the number of retries to attempt for the role.|
5151
|`aap_configuration_loop_delay`|1000|no|This variable sets the loop_delay for the role globally.|
52-
|`ah_configuration_collection_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.|
52+
|`hub_configuration_collection_loop_delay`|`aap_configuration_loop_delay`|no|This variable sets the loop_delay for the role.|
5353
|`aap_configuration_async_delay`|1|no|This sets the delay between retries for the role globally.|
54-
|`ah_configuration_collection_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.|
54+
|`hub_configuration_collection_async_delay`|`aap_configuration_async_delay`|no|This sets the delay between retries for the role.|
5555

5656
### Secure Logging Variables
5757

5858
The following Variables compliment each other.
5959
If Both variables are not set, secure logging defaults to false.
6060
The role defaults to False as normally the add repository task does not include sensitive information.
61-
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.
61+
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.
6262

6363
|Variable Name|Default Value|Required|Description|
6464
|:---:|:---:|:---:|:---:|
65-
|`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.|
65+
|`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.|
6666
|`aap_configuration_secure_logging`|`False`|no|This variable enables secure logging as well, but is shared across multiple roles, see above.|
6767

6868
## Data Structure
@@ -73,7 +73,7 @@ ah_configuration_repository_secure_logging defaults to the value of aap_configur
7373

7474
```yaml
7575
---
76-
ah_collections:
76+
hub_collections:
7777
- namespace: 'awx'
7878
name: 'awx'
7979
path: /var/tmp/collections/awx_awx-15.0.0.tar.gz

0 commit comments

Comments
 (0)