openstack/kayobe
Code Issues Proposed changes

Don't specify a docker registry when kolla_docker_registry is defined but None

Browse Source 
This is the default.
This commit is contained in:
Mark Goddard 2017-11-17 17:30:29 +00:00
parent 19614e9491
commit 713da0730f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,7 +38,9 @@
username: "{{ kolla_docker_registry_username }}" username: "{{ kolla_docker_registry_username }}"
password: "{{ kolla_docker_registry_password }}" password: "{{ kolla_docker_registry_password }}"
reauthorize: yes reauthorize: yes
when: kolla_docker_registry_username is not none and kolla_docker_registry_password is not none when:
- kolla_docker_registry_username is not none
- kolla_docker_registry_password is not none
- name: Ensure Kolla container images are built - name: Ensure Kolla container images are built
shell: > shell: >
@ -47,7 +49,7 @@
kolla-build \ kolla-build \
--config-dir {{ kolla_build_config_path }} \ --config-dir {{ kolla_build_config_path }} \
{% if item.type is defined %}--type {{ item.type }}{% endif %} \ {% if item.type is defined %}--type {{ item.type }}{% endif %} \
{% if kolla_docker_registry != "" and kolla_docker_registry != None %}--registry {{ kolla_docker_registry }}{% endif %} \ {% if kolla_docker_registry is not none %}--registry {{ kolla_docker_registry }}{% endif %} \
{% if push_images | bool %}--push{% endif %} \ {% if push_images | bool %}--push{% endif %} \
{{ item.regexes }} 2>&1 | tee --append {{ kolla_build_log_path }} {{ item.regexes }} 2>&1 | tee --append {{ kolla_build_log_path }}
with_items: "{{ container_image_sets }}" with_items: "{{ container_image_sets }}"