Skip to content

Commit 66f5893

Browse files
sean-m-sullivansean-m-sullivan
committed
Merge branch 'redhat-cop:devel' into suite_md_update
2 parents d93a048 + 3f2e373 commit 66f5893

File tree

37 files changed

+138
-133
lines changed

37 files changed

+138
-133
lines changed

‎.pre-commit-config.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ repos:
1414
# types:
1515
# - yaml
1616
- repo: 'https://github.com/ansible-community/ansible-lint.git'
17-
rev: v6.8.2
17+
rev: v6.8.4
1818
hooks:
1919
# see discussions here about what arguments are used, and behavior
2020
# https://github.com/ansible/ansible-lint/issues/649
@@ -34,7 +34,7 @@ repos:
3434
hooks:
3535
- id: markdownlint-cli2
3636
- repo: https://github.com/ambv/black
37-
rev: 22.8.0
37+
rev: 22.10.0
3838
hooks:
3939
- id: black
4040
name: black

‎README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,13 @@ The AWX.AWX OR ANSIBLE.CONTROLLER collections MUST be installed in order for thi
2323
2424
## Redhat Communities of Practice Configuration Collections Suite
2525
26-
2726
|Collection Name|Purpose|
2827
|:---:|:---:|
2928
|[Controller Configuration](https://galaxy.ansible.com/redhat_cop/controller_configuration)|Automation controller configuration|
3029
|[Hub Configuration](https://galaxy.ansible.com/redhat_cop/ah_configuration)|Automation hub configuration|
3130
|[EE Utilities](https://galaxy.ansible.com/redhat_cop/ee_utilities)|Execution Environment creation utilities|
3231
|[AAP installation Utilities](https://galaxy.ansible.com/redhat_cop/aap_utilities)|Ansible Automation Platform Utilities|
33-
|[AAP Configuration Template](https://galaxy.ansible.com/redhat_cop/aap_configuration_template)|Configuration Template for this suite|
32+
|[AAP Configuration Template](https://github.com/redhat-cop/aap_configuration_template)|Configuration Template for this suite|
3433
3534
## Included content
3635

‎examples/configs/inventory_sources.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
---
2+
controller_configuration_inventory_source_update_async_retries: 60
3+
controller_configuration_inventory_source_update_async_delay: 2
24
controller_inventory_sources:
35
- name: RHVM-01
46
source: scm

‎examples/configure_controller.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,13 @@
128128

129129
- name: "Error out on empty list"
130130
ansible.builtin.set_fact:
131-
error_empty_diff: "{{ lookup('controller_object_diff', api_list=controller_api_results, compare_list=differential_test_items, warn_on_empty_api=false) }}"
131+
error_empty_diff: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', api_list=controller_api_results, compare_list=differential_test_items, warn_on_empty_api=false) }}"
132132
ignore_errors: true
133133
register: error_results
134134

135135
- name: "Warn out on empty list"
136136
ansible.builtin.set_fact:
137-
warn_empty_diff: "{{ lookup('controller_object_diff', api_list=controller_api_results, compare_list=differential_test_items) }}"
137+
warn_empty_diff: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', api_list=controller_api_results, compare_list=differential_test_items) }}"
138138
register: warn_results
139139

140140
- name: "Assert that the empty list error correctly"

‎examples/tasks/differential.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
11
---
22
- name: "Get the API list in the Default Organization of all {{ differential_item.name }}"
33
ansible.builtin.set_fact:
4-
controller_api_results: "{{ lookup('awx.awx.controller_object_diff', differential_item.name, query_params={'organization': controller_organization_id.id}, host=controller_hostname, username=controller_username, password=controller_password, verify_ssl=false) }}"
4+
controller_api_results: "{{ lookup(controller_api_plugin, differential_item.name, query_params={'organization': controller_organization_id.id}, host=controller_hostname, username=controller_username, password=controller_password, verify_ssl=false) }}"
55

66
- name: "Find the difference between what is on the Controller versus curated list of {{ differential_item.name }}"
77
ansible.builtin.set_fact:
8-
set_absent_diff: "{{ lookup('awx.awx.controller_object_diff', api_list=controller_api_results, compare_list=differential_item.differential_test_items, with_present=differential_item.with_present) }}"
8+
set_absent_diff: "{{ lookup('redhat_cop.controller_configuration.controller_object_diff', api_list=controller_api_results, compare_list=differential_item.differential_test_items, with_present=differential_item.with_present) }}"
99

1010
- name: Display set_absent_diff
1111
ansible.builtin.debug:
1212
var: set_absent_diff
1313

14+
- name: Display differential_item.expected_test_result
15+
ansible.builtin.debug:
16+
var: differential_item.expected_test_result
17+
1418
- name: "Assert that the expected results match for {{ differential_item.name }}"
1519
ansible.builtin.assert:
1620
that:

‎playbooks/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Examples of the playbooks in use can be found in the examples folder.
3535
### Standard Controller Variables
3636

3737
|Variable Name|Default Value|Required|Description|Example|
38-
|:---:|:---:|:---:|:---:|:---:|
38+
|:---|:---:|:---:|:---|:---|
3939
|`controller_state`|"present"|no|The state all objects will take unless overriden by object default|'absent'|
4040
|`controller_hostname`|""|yes|URL to the Ansible Controller Server.|127.0.0.1|
4141
|`controller_validate_certs`|`True`|no|Whether or not to validate the Ansible Controller Server's SSL certificate.||

‎roles/ad_hoc_command/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ Currently:
1717
### Authentication
1818

1919
|Variable Name|Default Value|Required|Description|Example|
20-
|:---:|:---:|:---:|:---:|:---:|
20+
|:---|:---:|:---:|:---|:---|
2121
|`controller_state`|"present"|no|The state all objects will take unless overridden by object default|'absent'|
2222
|`controller_hostname`|""|yes|URL to the Ansible Controller Server.|127.0.0.1|
2323
|`controller_validate_certs`|`True`|no|Whether or not to validate the Ansible Controller Server's SSL certificate.||
24-
|`controller_username`|""|yes|Admin User on the Ansible Controller Server.||
25-
|`controller_password`|""|yes|Controller Admin User's password on the Ansible Controller Server. This should be stored in an Ansible Vault at vars/controller-secrets.yml or elsewhere and called from a parent playbook.||
26-
|`controller_oauthtoken`|""|yes|Controller Admin User's token on the Ansible Controller Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook.||
24+
|`controller_username`|""|no|Admin User on the Ansible Controller Server. Either username / password or oauthtoken need to be specified.||
25+
|`controller_password`|""|no|Controller Admin User's password on the Ansible Controller Server. This should be stored in an Ansible Vault at vars/controller-secrets.yml or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
26+
|`controller_oauthtoken`|""|no|Controller Admin User's token on the Ansible Controller Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
2727
|`controller_ad_hoc_commands`|`see below`|yes|Data structure describing your ad hoc commands to run Described below.||
2828

2929
### Secure Logging Variables

‎roles/ad_hoc_command_cancel/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ Currently:
1717
### Authentication
1818

1919
|Variable Name|Default Value|Required|Description|Example|
20-
|:---:|:---:|:---:|:---:|:---:|
20+
|:---|:---:|:---:|:---|:---|
2121
|`controller_state`|"present"|no|The state all objects will take unless overridden by object default|'absent'|
2222
|`controller_hostname`|""|yes|URL to the Ansible Controller Server.|127.0.0.1|
2323
|`controller_validate_certs`|`True`|no|Whether or not to validate the Ansible Controller Server's SSL certificate.||
24-
|`controller_username`|""|yes|Admin User on the Ansible Controller Server.||
25-
|`controller_password`|""|yes|Controller Admin User's password on the Ansible Controller Server. This should be stored in an Ansible Vault at vars/controller-secrets.yml or elsewhere and called from a parent playbook.||
26-
|`controller_oauthtoken`|""|yes|Controller Admin User's token on the Ansible Controller Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook.||
24+
|`controller_username`|""|no|Admin User on the Ansible Controller Server. Either username / password or oauthtoken need to be specified.||
25+
|`controller_password`|""|no|Controller Admin User's password on the Ansible Controller Server. This should be stored in an Ansible Vault at vars/controller-secrets.yml or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
26+
|`controller_oauthtoken`|""|no|Controller Admin User's token on the Ansible Controller Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
2727
|`controller_ad_hoc_commands_cancel`|`see below`|yes|Data structure describing your ad hoc jobs to cancel Described below.||
2828

2929
### Secure Logging Variables

‎roles/applications/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ Currently:
1717
### Authentication
1818

1919
|Variable Name|Default Value|Required|Description|Example|
20-
|:---:|:---:|:---:|:---:|:---:|
20+
|:---|:---:|:---:|:---|:---|
2121
|`controller_state`|"present"|no|The state all objects will take unless overridden by object default|'absent'|
2222
|`controller_hostname`|""|yes|URL to the Ansible Controller Server.|127.0.0.1|
2323
|`controller_validate_certs`|`True`|no|Whether or not to validate the Ansible Controller Server's SSL certificate.||
24-
|`controller_username`|""|yes|Admin User on the Ansible Controller Server.||
25-
|`controller_password`|""|yes|Controller Admin User's password on the Ansible Controller Server. This should be stored in an Ansible Vault at vars/controller-secrets.yml or elsewhere and called from a parent playbook.||
26-
|`controller_oauthtoken`|""|yes|Controller Admin User's token on the Ansible Controller Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook.||
24+
|`controller_username`|""|no|Admin User on the Ansible Controller Server. Either username / password or oauthtoken need to be specified.||
25+
|`controller_password`|""|no|Controller Admin User's password on the Ansible Controller Server. This should be stored in an Ansible Vault at vars/controller-secrets.yml or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
26+
|`controller_oauthtoken`|""|no|Controller Admin User's token on the Ansible Controller Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
2727
|`controller_applications`|`see below`|yes|Data structure describing your applications, described below.||
2828

2929
### Secure Logging Variables

‎roles/credential_input_sources/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ Currently:
1717
### Authentication
1818

1919
|Variable Name|Default Value|Required|Description|Example|
20-
|:---:|:---:|:---:|:---:|:---:|
20+
|:---|:---:|:---:|:---|:---|
2121
|`controller_state`|"present"|no|The state all objects will take unless overridden by object default|'absent'|
2222
|`controller_hostname`|""|yes|URL to the Ansible Controller Server.|127.0.0.1|
2323
|`controller_validate_certs`|`True`|no|Whether or not to validate the Ansible Controller Server's SSL certificate.||
24-
|`controller_username`|""|yes|Admin User on the Ansible Controller Server.||
25-
|`controller_password`|""|yes|Controller Admin User's password on the Ansible Controller Server. This should be stored in an Ansible Vault at vars/controller-secrets.yml or elsewhere and called from a parent playbook.||
26-
|`controller_oauthtoken`|""|yes|Controller Admin User's token on the Ansible Controller Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook.||
24+
|`controller_username`|""|no|Admin User on the Ansible Controller Server. Either username / password or oauthtoken need to be specified.||
25+
|`controller_password`|""|no|Controller Admin User's password on the Ansible Controller Server. This should be stored in an Ansible Vault at vars/controller-secrets.yml or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
26+
|`controller_oauthtoken`|""|no|Controller Admin User's token on the Ansible Controller Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
2727
|`controller_credential_input_sources`|`see below`|yes|Data structure describing your credential input sources Described below.||
2828

2929
### Secure Logging Variables

‎roles/credential_types/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ Currently:
1717
### Authentication
1818

1919
|Variable Name|Default Value|Required|Description|Example|
20-
|:---:|:---:|:---:|:---:|:---:|
20+
|:---|:---:|:---:|:---|:---|
2121
|`controller_state`|"present"|no|The state all objects will take unless overridden by object default|'absent'|
2222
|`controller_hostname`|""|yes|URL to the Ansible Controller Server.|127.0.0.1|
2323
|`controller_validate_certs`|`True`|no|Whether or not to validate the Ansible Controller Server's SSL certificate.||
24-
|`controller_username`|""|yes|Admin User on the Ansible Controller Server.||
25-
|`controller_password`|""|yes|Controller Admin User's password on the Ansible Controller Server. This should be stored in an Ansible Vault at vars/controller-secrets.yml or elsewhere and called from a parent playbook.||
26-
|`controller_oauthtoken`|""|yes|Controller Admin User's token on the Ansible Controller Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook.||
24+
|`controller_username`|""|no|Admin User on the Ansible Controller Server. Either username / password or oauthtoken need to be specified.||
25+
|`controller_password`|""|no|Controller Admin User's password on the Ansible Controller Server. This should be stored in an Ansible Vault at vars/controller-secrets.yml or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
26+
|`controller_oauthtoken`|""|no|Controller Admin User's token on the Ansible Controller Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
2727
|`controller_credential_types`|`see below`|yes|Data structure describing your credential types Described below.||
2828

2929
### Secure Logging Variables

‎roles/credentials/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ Currently:
1717
### Authentication
1818

1919
|Variable Name|Default Value|Required|Description|Example|
20-
|:---:|:---:|:---:|:---:|:---:|
20+
|:---|:---:|:---:|:---|:---|
2121
|`controller_state`|"present"|no|The state all objects will take unless overridden by object default|'absent'|
2222
|`controller_hostname`|""|yes|URL to the Ansible Controller Server.|127.0.0.1|
2323
|`controller_validate_certs`|`True`|no|Whether or not to validate the Ansible Controller Server's SSL certificate.||
24-
|`controller_username`|""|yes|Admin User on the Ansible Controller Server.||
25-
|`controller_password`|""|yes|Controller Admin User's password on the Ansible Controller Server. This should be stored in an Ansible Vault at vars/controller-secrets.yml or elsewhere and called from a parent playbook.||
26-
|`controller_oauthtoken`|""|yes|Controller Admin User's token on the Ansible Controller Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook.||
24+
|`controller_username`|""|no|Admin User on the Ansible Controller Server. Either username / password or oauthtoken need to be specified.||
25+
|`controller_password`|""|no|Controller Admin User's password on the Ansible Controller Server. This should be stored in an Ansible Vault at vars/controller-secrets.yml or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
26+
|`controller_oauthtoken`|""|no|Controller Admin User's token on the Ansible Controller Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
2727
|`controller_credentials`|`see below`|yes|Data structure describing your credentials Described below.||
2828

2929
### Secure Logging Variables

‎roles/dispatch/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ It is possible to redefine this variable with a subset of roles or with differen
5454
### Authentication
5555

5656
|Variable Name|Default Value|Required|Description|Example|
57-
|:---:|:---:|:---:|:---:|:---:|
57+
|:---|:---:|:---:|:---|:---|
5858
|`controller_state`|"present"|no|The state all objects will take unless overridden by object default|'absent'|
5959
|`controller_hostname`|""|yes|URL to the Ansible Controller Server.|127.0.0.1|
6060
|`controller_validate_certs`|`True`|no|Whether or not to validate the Ansible Controller Server's SSL certificate.||
61-
|`controller_username`|""|yes|Admin User on the Ansible Controller Server.||
62-
|`controller_password`|""|yes|Controller Admin User's password on the Ansible Controller Server. This should be stored in an Ansible Vault at vars/controller-secrets.yml or elsewhere and called from a parent playbook.||
63-
|`controller_oauthtoken`|""|yes|Controller Admin User's token on the Ansible Controller Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook.||
61+
|`controller_username`|""|no|Admin User on the Ansible Controller Server. Either username / password or oauthtoken need to be specified.||
62+
|`controller_password`|""|no|Controller Admin User's password on the Ansible Controller Server. This should be stored in an Ansible Vault at vars/controller-secrets.yml or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
63+
|`controller_oauthtoken`|""|no|Controller Admin User's token on the Ansible Controller Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
6464

6565
### Secure Logging Variables
6666

‎roles/execution_environments/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ Currently:
1717
### Authentication
1818

1919
|Variable Name|Default Value|Required|Description|Example|
20-
|:---:|:---:|:---:|:---:|:---:|
20+
|:---|:---:|:---:|:---|:---|
2121
|`controller_state`|"present"|no|The state all objects will take unless overridden by object default|'absent'|
2222
|`controller_hostname`|""|yes|URL to the Ansible Controller Server.|127.0.0.1|
2323
|`controller_validate_certs`|`True`|no|Whether or not to validate the Ansible Controller Server's SSL certificate.||
24-
|`controller_username`|""|yes|Admin User on the Ansible Controller Server.||
25-
|`controller_password`|""|yes|Controller Admin User's password on the Ansible Controller Server. This should be stored in an Ansible Vault at vars/controller-secrets.yml or elsewhere and called from a parent playbook.||
26-
|`controller_oauthtoken`|""|yes|Controller Admin User's token on the Ansible Controller Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook.||
24+
|`controller_username`|""|no|Admin User on the Ansible Controller Server. Either username / password or oauthtoken need to be specified.||
25+
|`controller_password`|""|no|Controller Admin User's password on the Ansible Controller Server. This should be stored in an Ansible Vault at vars/controller-secrets.yml or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
26+
|`controller_oauthtoken`|""|no|Controller Admin User's token on the Ansible Controller Server. This should be stored in an Ansible Vault at or elsewhere and called from a parent playbook. Either username / password or oauthtoken need to be specified.||
2727
|`controller_execution_environments`|`see below`|yes|Data structure describing your organization or organizations Described below.||
2828

2929
### Secure Logging Variables

0 commit comments

Comments
 (0)