fix ansible config again (#49)

redhat-cop · Dec 6, 2022 · e3c0a8e · e3c0a8e
1 parent 8f5ff5b
commit e3c0a8e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/roles/ee_builder/README.md b/roles/ee_builder/README.md
@@ -62,7 +62,7 @@ Best practice is to use the default images, unless needing to pull from another
 |`ee_builder_image`|registry.redhat.io/ansible-automation-platform-23/ansible-builder-rhel8:latest|no|str|Build arg specifies the image used for compiling type tasks.||
 |`ee_base_registry_username`|ee_registry_username|no|str|Username to use when authenticating to base registries. If neither ee or base registry provided will be omitted.||
 |`ee_base_registry_password`|ee_registry_password|no|str|Password to use when authenticating to base registries. If neither ee or base registry provided will be omitted.||
-|`ee_create_ansible_config`|true|no|bool|Whether or not to create the ansible config file for use in building an Execution Environment.||
+|`ee_pull_collections_from_hub`|true|no|bool|Whether or not to pull collections from a specific hub for use in building an Execution Environment.||
 |`ee_ah_host`|`ah_host`|no|str|Host to use for ansible config file. Alternative default is to use variable from infra.ah_configuration. Required if `ee_create_ansible_config` is `True`.||
 |`ee_ah_token`|`ah_token`|no|str|Token to use for ansible config file. Alternative default is to use variable from infra.ah_configuration. Required if `ee_create_ansible_config` is `True`.||
 

diff --git a/roles/ee_builder/defaults/main.yml b/roles/ee_builder/defaults/main.yml
@@ -24,7 +24,7 @@ ee_list: []
 # Controls
 ee_image_push: true
 ee_update_base_images: true
-ee_create_ansible_config: true
+ee_pull_collections_from_hub: "{{ ee_create_ansible_config | default('true') }}"  # Keep old variable as default, remove in 3 months March 2023
 ee_builder_dir_clean: true
 ee_validate_certs: false
 ee_prune_images: true

diff --git a/roles/ee_builder/tasks/00_build_ee.yml b/roles/ee_builder/tasks/00_build_ee.yml
@@ -52,7 +52,7 @@
     src: ansible.cfg.j2
     dest: "{{ builder_dir }}/ansible.cfg"
     mode: '0644'
-  when: ee_create_ansible_config
+  when: ee_pull_collections_from_hub
 
 - name: Create EE definition file
   ansible.builtin.template:

diff --git a/roles/ee_builder/templates/execution_environment.yml.j2 b/roles/ee_builder/templates/execution_environment.yml.j2
@@ -20,7 +20,7 @@ build_arg_defaults:
 {% endif %}
 {% endif %}
 
-{% if ansible_cfg_file is defined %}
+{% if ee_pull_collections_from_hub %}
 ansible_config: {{ ansible_cfg_file }}
 {% endif %}