Skip to content

Commit 92f0bd9

Browse files
Ci fix (#1112)
* ci fix * ci fix * update linting * update ci
1 parent 54a3452 commit 92f0bd9

File tree

10 files changed

+19
-14
lines changed

10 files changed

+19
-14
lines changed

.github/files/calculate_change.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ elif [ $MINOR -eq 0 ]; then
1212
else
1313
echo "level=patch" >> "$GITHUB_OUTPUT"
1414
echo "Determined change level: patch"
15-
fi
15+
fi

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ on:
1515
- 'v[0-9]+.[0-9]+.[0-9]+[abrc]+[0-9]+' # alpha, beta, release candidate (rc)
1616
- 'v[0-9]+.[0-9]+.[0-9]+.dev[0-9]+' # development versions
1717
pull_request:
18+
pull_request_target:
1819
schedule:
1920
- cron: "0 6 * * *"
2021

README.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,18 +80,21 @@ If you were using a version of infra.controller_configuration, please refer to o
8080

8181
**Install This Collection:**
8282
Ensure this collection (`infra.aap_configuration`) is installed:
83+
8384
```bash
8485
ansible-galaxy collection install infra.aap_configuration
8586
```
8687

8788
**Run Playbooks from This Collection:**
8889
To execute a playbook packaged within this collection (e.g., `configure_aap.yml`):
90+
8991
```console
9092
ansible-playbook infra.aap_configuration.configure_aap.yml
9193
```
9294

9395
**Troubleshooting "couldn't resolve module/action":**
9496
This error usually means the required Ansible collection (e.g., `infra.aap_configuration` or a dependency like ansible.controller) is:
97+
9598
* Not installed.
9699
* Incorrectly named in the playbook.
97100
* Not found in Ansible's configured collection paths.
@@ -103,20 +106,20 @@ Define following vars here, or in `aap_configs/controller_auth.yml`
103106

104107
You can also specify authentication by a combination of either:
105108

106-
- `aap_hostname`, `aap_username`, `aap_password`
107-
- `aap_hostname`, `aap_token`
109+
* `aap_hostname`, `aap_username`, `aap_password`
110+
* `aap_hostname`, `aap_token`
108111

109112
The OAuth2 token is the preferred method. You can obtain the token through the preferred `controller_token` module, or through the
110113
AWX CLI [login](https://docs.ansible.com/automation-controller/latest/html/controllerapi/authentication.html)
111114
command.
112115

113116
These can be specified via (from highest to lowest precedence):
114117

115-
- direct role variables as mentioned above
116-
- environment variables (most useful when running against localhost)
117-
- a config file path specified by the `controller_config_file` parameter
118-
- a config file at `~/.controller_cli.cfg`
119-
- a config file at `/etc/controller/controller_cli.cfg`
118+
* direct role variables as mentioned above
119+
* environment variables (most useful when running against localhost)
120+
* a config file path specified by the `controller_config_file` parameter
121+
* a config file at `~/.controller_cli.cfg`
122+
* a config file at `/etc/controller/controller_cli.cfg`
120123

121124
Config file syntax looks like this:
122125

@@ -161,7 +164,7 @@ A [Template to use in order to start using the collections can be found here](ht
161164

162165
### See Also
163166

164-
- [Ansible Using collections](https://docs.ansible.com/ansible/latest/user_guide/collections_using.html) for more details.
167+
[Ansible Using collections](https://docs.ansible.com/ansible/latest/user_guide/collections_using.html) for more details.
165168

166169
## Release and Upgrade Notes
167170

roles/controller_workflow_job_templates/tasks/add_workflows_schema.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070

7171
# Create links between workflow node
7272
- name: add_workflows_schema | Create links between Workflow Nodes
73-
workflow_job_template_node:
73+
ansible.controller.workflow_job_template_node:
7474
identifier: "{{ __workflow_loop_node_item.identifier | mandatory }}"
7575
workflow: "{{ __workflow_loop_item.name | mandatory }}"
7676
always_nodes: "{{ __workflow_loop_node_item.always_nodes | default(__workflow_loop_node_item.related.always_nodes | default([], true) | selectattr('identifier',

roles/gateway_authenticators/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ gateway_authenticators:
122122
### Run Playbook
123123
124124
File name: [configure_aap.yml](https://github.com/redhat-cop/infra.aap_configuration/blob/devel/playbooks/configure_aap.yml) can be found in the top level playbooks directory.
125+
125126
```shell
126127
ansible-playbook infra.aap_configuration.configure_aap.yml
127128
```

roles/gateway_organizations/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ aap_organizations:
146146
### Run Playbook
147147
148148
File name: [configure_aap.yml](https://github.com/redhat-cop/infra.aap_configuration/blob/devel/playbooks/configure_aap.yml) can be found in the top level playbooks directory.
149+
149150
```shell
150151
ansible-playbook infra.aap_configuration.configure_aap.yml
151152
```

roles/gateway_role_user_assignments/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ gateway_role_user_assignments:
100100
### Run Playbook
101101
102102
File name: [configure_aap.yml](https://github.com/redhat-cop/infra.aap_configuration/blob/devel/playbooks/configure_aap.yml) can be found in the top level playbooks directory.
103+
103104
```shell
104105
ansible-playbook infra.aap_configuration.configure_aap.yml
105106
```

tests/configure_controller.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
# aap_hostname: controller.example.com
1010
# aap_username: admin
1111
# aap_password: changeme
12-
- infra.aap_configuration
1312

1413
pre_tasks:
1514
- name: Determine collection (block)
@@ -175,7 +174,7 @@
175174
var: launched_controller_workflows
176175

177176
- name: Wait for workflow to finish
178-
job_wait:
177+
ansible.controller.job_wait:
179178
job_id: "{{ launched_controller_workflows.results[0].id }}"
180179
job_type: workflow_jobs
181180
timeout: 180

tests/configure_controller_export_model.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
vars:
66
workflow_job_templates_secure_logging: false
77
aap_validate_certs: false
8-
- infra.aap_configuration
98
# Define following vars here, or in configs/controller_auth.yml
109
# aap_hostname: controller.example.com
1110
# aap_username: admin

tests/configure_platform.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
var: launched_controller_workflows
153153

154154
- name: Wait for workflow to finish
155-
job_wait:
155+
ansible.controller.job_wait:
156156
job_id: "{{ launched_controller_workflows.results[0].id }}"
157157
job_type: workflow_jobs
158158
timeout: 180

0 commit comments

Comments
 (0)