Make config file optional for container builds

Change-Id: I98625ab9a01adf111e3754f34d389221e681db44
Depends-On: https://review.openstack.org/#/c/639847/
This commit is contained in:
Alex Schultz 2019-02-27 14:46:36 -07:00
parent 3a7a87ce71
commit ee784f6a31
2 changed files with 8 additions and 2 deletions

View File

@ -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

View File

@ -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] %}