From 63cf1abf9fc0ffe523f4770228cfbedde9e38dcc Mon Sep 17 00:00:00 2001 From: John Garbutt Date: Tue, 21 Nov 2017 15:33:44 +0000 Subject: [PATCH] Fix image build regex 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. --- ansible/container-image-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/container-image-build.yml b/ansible/container-image-build.yml index dd88951d0..532069a3c 100644 --- a/ansible/container-image-build.yml +++ b/ansible/container-image-build.yml @@ -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 }}"