Skip to content

Commit de32e96

Browse files
more fixes (#953)
* more fixes * Update galaxy.yml.j2 --------- Co-authored-by: David Danielsson <[email protected]>
1 parent 6bdecac commit de32e96

File tree

6 files changed

+37
-46
lines changed

6 files changed

+37
-46
lines changed

.github/files/galaxy.yml.j2

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,26 @@ version: {{ collection_version }}
55
description: A collection of roles to manage Ansible Controller
66
readme: README.md
77
authors:
8-
- Andrew Huffman
9-
- Adebisi Oyawale @aoyawale
10-
- Kedar Kulkarni @kedark3
11-
- Tom Page @Tompage1994
12-
- Sean Sullivan @sean-m-sullivan
13-
- David Danielsson @djdanielsson
8+
- Andrew Huffman
9+
- Adebisi Oyawale @aoyawale
10+
- Kedar Kulkarni @kedark3
11+
- Tom Page @Tompage1994
12+
- Sean Sullivan @sean-m-sullivan
13+
- David Danielsson @djdanielsson
1414
repository: {{ collection_repo }}
1515
issues: {{ collection_repo }}issues
1616
build_ignore:
17-
- galaxy.yml.j2
18-
- release.yml
19-
- .github
20-
- '*.tar.gz'
21-
- tests/*
17+
- galaxy.yml.j2
18+
- release.yml
19+
- .github
20+
- "*.tar.gz"
21+
- tests/*
2222
license:
23-
- GPL-3.0-or-later
24-
dependencies:
25-
"ansible.eda": ">=2.2.0"
26-
"ansible.hub": ">=1.0.0"
23+
- GPL-3.0-or-later
2724
tags:
28-
- controller
29-
- collection
30-
- controller_configuration
31-
- automation_platform
32-
- infrastructure
25+
- controller
26+
- collection
27+
- controller_configuration
28+
- automation_platform
29+
- infrastructure
3330
...

galaxy.yml

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,26 @@ version: 3.0.0
55
description: A collection of roles to manage Ansible Controller
66
readme: README.md
77
authors:
8-
- Andrew Huffman
9-
- Adebisi Oyawale @aoyawale
10-
- Kedar Kulkarni @kedark3
11-
- Tom Page @Tompage1994
12-
- Sean Sullivan @sean-m-sullivan
13-
- David Danielsson @djdanielsson
8+
- Andrew Huffman
9+
- Adebisi Oyawale @aoyawale
10+
- Kedar Kulkarni @kedark3
11+
- Tom Page @Tompage1994
12+
- Sean Sullivan @sean-m-sullivan
13+
- David Danielsson @djdanielsson
1414
repository: https://github.com/redhat-cop/aap_configuration/
1515
issues: https://github.com/redhat-cop/aap_configuration/issues
1616
build_ignore:
17-
- galaxy.yml.j2
18-
- release.yml
19-
- .github
20-
- '*.tar.gz'
21-
- tests/*
17+
- galaxy.yml.j2
18+
- release.yml
19+
- .github
20+
- "*.tar.gz"
21+
- tests/*
2222
license:
23-
- GPL-3.0-or-later
24-
dependencies:
25-
"ansible.eda": ">=2.2.0"
26-
"ansible.hub": ">=1.0.0"
23+
- GPL-3.0-or-later
2724
tags:
28-
- controller
29-
- collection
30-
- controller_configuration
31-
- automation_platform
32-
- infrastructure
25+
- controller
26+
- collection
27+
- controller_configuration
28+
- automation_platform
29+
- infrastructure
3330
...

roles/controller_organizations/tasks/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
request_timeout: "{{ aap_request_timeout | default(omit, true) }}"
2323
controller_host: "{{ aap_hostname | default(omit, true) }}"
2424
validate_certs: "{{ aap_validate_certs | default(omit) }}"
25-
loop: "{{ organizations if organizations is defined else controller_organizations }}"
25+
loop: "{{ aap_organizations }}"
2626
loop_control:
2727
loop_var: __controller_organizations_item
2828
label: "{{ __operation.verb }} organization {{ __controller_organizations_item.name }}"

roles/dispatch/defaults/main.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,6 @@ eda_configuration_dispatcher_roles:
166166
- role: eda_projects
167167
var: eda_projects
168168
tags: project
169-
- role: eda_project_sync
170-
var: eda_projects
171-
tags: project_sync
172169
- role: eda_decision_environments
173170
var: eda_decision_environments
174171
tags: decision_environment

tests/configs_export_model/job_templates_export.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ job_templates:
155155
type: text
156156
- question_description: Choosing yes or no.
157157
min: 0
158-
default: 'yes'
158+
default: true
159159
max: 0
160160
required: true
161161
choices: |-

tests/configs_export_model/workflows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ workflow_job_templates:
238238
variable: option_true_false
239239
min:
240240
max:
241-
default: 'yes'
241+
default: true
242242
choices: |-
243243
yes
244244
no

0 commit comments

Comments
 (0)