openstack/kayobe
Code Issues Proposed changes

Fix image build regex

Browse Source 
Turns out kolla_docker_registry is always defined, but is sometimes an
empty string or None. It defaults to None.

Before this change we always sent "--registry" but the kolla build CLI
would pick up our regex as the parameter associated with "--registry" so
we would get a strange image tag, and still build all the images.
This commit is contained in:
John Garbutt 2017-11-21 15:33:44 +00:00
parent a98b25452e
commit 63cf1abf9f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/container-image-build.yml
View File

@ -47,7 +47,7 @@
kolla-build \
--config-dir {{ kolla_build_config_path }} \
{% if item.type is defined %}--type {{ item.type }}{% endif %} \
{% if kolla_docker_registry is defined %}--registry {{ kolla_docker_registry }}{% endif %} \
{% if kolla_docker_registry != "" and kolla_docker_registry != None %}--registry {{ kolla_docker_registry }}{% endif %} \
{% if push_images | bool %}--push{% endif %} \
{{ item.regexes }} 2>&1 | tee --append {{ kolla_build_log_path }}
with_items: "{{ container_image_sets }}"