From 11e9827da24a4483853b5a94476870c5543e61fb Mon Sep 17 00:00:00 2001 From: ktibi Date: Wed, 25 Oct 2017 15:14:15 +0200 Subject: [PATCH] Update container-image-build.yml --- ansible/container-image-build.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ansible/container-image-build.yml b/ansible/container-image-build.yml index 4a8334487..db6fb7656 100644 --- a/ansible/container-image-build.yml +++ b/ansible/container-image-build.yml @@ -7,13 +7,7 @@ # Set this variable to a space-separated list of regexes to override the # default set of images. container_image_regexes: "" - kolla_build_log_path: "/var/log/kolla-build.log" - pre_tasks: - - name: Login to docker registry - docker_login: - username: "{{ kolla_docker_registry_username }}" - password: "{{ kolla_docker_registry_password }}" - when: kolla_docker_registry_username is not none and kolla_docker_registry_password is not none + kolla_build_log_path: "/var/log/kolla-build.log" tasks: - name: Set the container image sets to build if images regexes specified set_fact: @@ -37,6 +31,12 @@ owner: "{{ ansible_user }}" group: "{{ ansible_user }}" become: True + + - name: Login to docker registry + docker_login: + username: "{{ kolla_docker_registry_username }}" + password: "{{ kolla_docker_registry_password }}" + when: kolla_docker_registry_username is not None and kolla_docker_registry_password is not None - name: Ensure Kolla container images are built shell: >