more fixes (redhat-cop#953)

* more fixes * Update galaxy.yml.j2 --------- Co-authored-by: David Danielsson <[email protected]>
Tompage1994 · Oct 23, 2024 · de32e96 · de32e96
1 parent 6bdecac
commit de32e96
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 46 deletions.
diff --git a/.github/files/galaxy.yml.j2 b/.github/files/galaxy.yml.j2
@@ -5,29 +5,26 @@ version: {{ collection_version }}
 description: A collection of roles to manage Ansible Controller
 readme: README.md
 authors:
-    - Andrew Huffman
-    - Adebisi Oyawale @aoyawale
-    - Kedar Kulkarni @kedark3
-    - Tom Page @Tompage1994
-    - Sean Sullivan @sean-m-sullivan
-    - David Danielsson @djdanielsson
+  - Andrew Huffman
+  - Adebisi Oyawale @aoyawale
+  - Kedar Kulkarni @kedark3
+  - Tom Page @Tompage1994
+  - Sean Sullivan @sean-m-sullivan
+  - David Danielsson @djdanielsson
 repository: {{ collection_repo }}
 issues: {{ collection_repo }}issues
 build_ignore:
-    - galaxy.yml.j2
-    - release.yml
-    - .github
-    - '*.tar.gz'
-    - tests/*
+  - galaxy.yml.j2
+  - release.yml
+  - .github
+  - "*.tar.gz"
+  - tests/*
 license:
-    - GPL-3.0-or-later
-dependencies:
-    "ansible.eda": ">=2.2.0"
-    "ansible.hub": ">=1.0.0"
+  - GPL-3.0-or-later
 tags:
-    - controller
-    - collection
-    - controller_configuration
-    - automation_platform
-    - infrastructure
+  - controller
+  - collection
+  - controller_configuration
+  - automation_platform
+  - infrastructure
 ...
diff --git a/galaxy.yml b/galaxy.yml
@@ -5,29 +5,26 @@ version: 3.0.0
 description: A collection of roles to manage Ansible Controller
 readme: README.md
 authors:
-    - Andrew Huffman
-    - Adebisi Oyawale @aoyawale
-    - Kedar Kulkarni @kedark3
-    - Tom Page @Tompage1994
-    - Sean Sullivan @sean-m-sullivan
-    - David Danielsson @djdanielsson
+  - Andrew Huffman
+  - Adebisi Oyawale @aoyawale
+  - Kedar Kulkarni @kedark3
+  - Tom Page @Tompage1994
+  - Sean Sullivan @sean-m-sullivan
+  - David Danielsson @djdanielsson
 repository: https://github.com/redhat-cop/aap_configuration/
 issues: https://github.com/redhat-cop/aap_configuration/issues
 build_ignore:
-    - galaxy.yml.j2
-    - release.yml
-    - .github
-    - '*.tar.gz'
-    - tests/*
+  - galaxy.yml.j2
+  - release.yml
+  - .github
+  - "*.tar.gz"
+  - tests/*
 license:
-    - GPL-3.0-or-later
-dependencies:
-    "ansible.eda": ">=2.2.0"
-    "ansible.hub": ">=1.0.0"
+  - GPL-3.0-or-later
 tags:
-    - controller
-    - collection
-    - controller_configuration
-    - automation_platform
-    - infrastructure
+  - controller
+  - collection
+  - controller_configuration
+  - automation_platform
+  - infrastructure
 ...
diff --git a/roles/controller_organizations/tasks/main.yml b/roles/controller_organizations/tasks/main.yml
@@ -22,7 +22,7 @@
     request_timeout:                    "{{ aap_request_timeout | default(omit, true) }}"
     controller_host:                    "{{ aap_hostname | default(omit, true) }}"
     validate_certs:                     "{{ aap_validate_certs | default(omit) }}"
-  loop: "{{ organizations if organizations is defined else controller_organizations }}"
+  loop: "{{ aap_organizations }}"
   loop_control:
     loop_var: __controller_organizations_item
     label: "{{ __operation.verb }} organization {{ __controller_organizations_item.name }}"

diff --git a/roles/dispatch/defaults/main.yml b/roles/dispatch/defaults/main.yml
@@ -166,9 +166,6 @@ eda_configuration_dispatcher_roles:
   - role: eda_projects
     var: eda_projects
     tags: project
-  - role: eda_project_sync
-    var: eda_projects
-    tags: project_sync
   - role: eda_decision_environments
     var: eda_decision_environments
     tags: decision_environment

diff --git a/tests/configs_export_model/job_templates_export.yml b/tests/configs_export_model/job_templates_export.yml
@@ -155,7 +155,7 @@ job_templates:
             type: text
           - question_description: Choosing yes or no.
             min: 0
-            default: 'yes'
+            default: true
             max: 0
             required: true
             choices: |-

diff --git a/tests/configs_export_model/workflows.yml b/tests/configs_export_model/workflows.yml
@@ -238,7 +238,7 @@ workflow_job_templates:
             variable: option_true_false
             min:
             max:
-            default: 'yes'
+            default: true
             choices: |-
               yes
               no