Merge "Make config file optional for container builds"

playbooks/tripleo-buildcontainers/run.yaml

@@ -24,6 +24,7 @@
       set_fact:
         push_registry: "{{ push_registry | default('127.0.0.1:8787') }}"
         push_containers: "{{ push_containers | default(false) | bool }}"
+        container_config: ""
 
     - name: Get contents of delorean repo baseurl for the version hash
       become: true
@@ -76,6 +77,12 @@
         mode: 0644
         force: yes
 
+    - name: Set config-file
+      set_fact:
+        container_config: "--config-file $TRIPLEO_COMMON_PATH/container-images/overcloud_containers.yaml"
+      when: ci_branch in ['pike', 'queens', 'rocky']
+
+
     - name: Generate building script
       template:
         src: templates/build.sh.j2

playbooks/tripleo-buildcontainers/templates/build.sh.j2

@@ -2,8 +2,7 @@
 source {{ workspace }}/venv/bin/activate
 TRIPLEO_COMMON_PATH="{{ openstack_git_root }}/tripleo-common"
 
-openstack overcloud container image build \
-    --config-file $TRIPLEO_COMMON_PATH/container-images/overcloud_containers.yaml \
+openstack overcloud container image build {{ container_config }}\
     --kolla-config-file {{ workspace }}/kolla-build.conf \
     {% if ci_branch != 'rocky' %}
     {% for item in exclude_containers[ansible_pkg_mgr] %}