Fix issue with the ansible config not being picked up (#47)

* update tarball release * add ansible-sanity * add ansible-sanity * add ansible-sanity * fix * fix ansible config
redhat-cop · Dec 5, 2022 · 6ccc073 · 6ccc073
1 parent 7697a6c
commit 6ccc073
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 8 deletions.
diff --git a/bindep.txt b/bindep.txt
diff --git a/changelogs/fragments/config_file_fix.yml b/changelogs/fragments/config_file_fix.yml
@@ -0,0 +1,4 @@
+---
+bugfixes:
+  - Fixed issue where ansible.cfg file was not being consumed by the builder.
+...
diff --git a/galaxy.yml.j2 b/galaxy.yml.j2
@@ -30,3 +30,4 @@ tags:
     - ee_utilities
     - ee_utils
 dependencies: {}
+...
diff --git a/requirements.txt b/requirements.txt
diff --git a/roles/ee_builder/defaults/main.yml b/roles/ee_builder/defaults/main.yml
@@ -16,6 +16,7 @@ ee_registry_password: "{{ ee_base_registry_password | default(omit, true) }}"
 bindep_file: bindep.txt
 python_requirements_file: requirements.txt
 galaxy_requirements_file: requirements.yml
+ansible_cfg_file: ansible.cfg
 
 # Default EE list
 ee_list: []

diff --git a/roles/ee_builder/tasks/00_build_ee.yml b/roles/ee_builder/tasks/00_build_ee.yml
@@ -73,7 +73,7 @@
       --verbosity {{ ee_verbosity | default(0) }}
   args:
     chdir: "{{ builder_dir }}/"
-  changed_when: true   # these will always run and will always report “changed” otherwise
+  changed_when: true   # these will always run and will always report "changed" otherwise
 
 - name: Push image to registry
   containers.podman.podman_image:

diff --git a/roles/ee_builder/templates/ansible.cfg.j2 b/roles/ee_builder/templates/ansible.cfg.j2
@@ -1,19 +1,19 @@
 [galaxy]
-server_list = automation_hub_cert,automation_hub_pub,automation_hub_validated,automation_hub_comm
+server_list = automation_hub_pub,automation_hub_cert,automation_hub_validated,automation_hub_comm
 ignore_certs = yes
 
 [galaxy_server.automation_hub_cert]
-url={{ ee_ah_host }}/api/galaxy/content/rh-certified/
+url=https://{{ ee_ah_host }}/api/galaxy/content/rh-certified/
 token={{ ee_ah_token }}
 
 [galaxy_server.automation_hub_pub]
-url={{ ee_ah_host }}/api/galaxy/content/published/
+url=https://{{ ee_ah_host }}/api/galaxy/content/published/
 token={{ ee_ah_token }}
 
 [galaxy_server.automation_hub_comm]
-url={{ ee_ah_host }}/api/galaxy/content/community/
+url=https://{{ ee_ah_host }}/api/galaxy/content/community/
 token={{ ee_ah_token }}
 
 [galaxy_server.automation_hub_validated]
-url={{ ee_ah_host }}/api/galaxy/content/validated/
+url=https://{{ ee_ah_host }}/api/galaxy/content/validated/
 token={{ ee_ah_token }}
diff --git a/roles/ee_builder/templates/execution_environment.yml.j2 b/roles/ee_builder/templates/execution_environment.yml.j2
@@ -20,8 +20,8 @@ build_arg_defaults:
 {% endif %}
 {% endif %}
 
-{% if ansible_config is defined %}
-ansible_config: '{{ ansible_config }}'
+{% if ansible_cfg_file is defined %}
+ansible_config: {{ ansible_cfg_file }}
 {% endif %}
 
 {% if (__execution_environment_definition.bindep is defined and __execution_environment_definition.bindep|length ) or