From fd2817326d28ffafd7f6032b1d4e009292d5de1e Mon Sep 17 00:00:00 2001 From: ktibi Date: Wed, 25 Oct 2017 12:04:09 +0200 Subject: [PATCH 1/9] add credentiels for registry --- ansible/roles/kolla-ansible/templates/globals.yml.j2 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ansible/roles/kolla-ansible/templates/globals.yml.j2 b/ansible/roles/kolla-ansible/templates/globals.yml.j2 index 4ea5895cb..d33c2211b 100644 --- a/ansible/roles/kolla-ansible/templates/globals.yml.j2 +++ b/ansible/roles/kolla-ansible/templates/globals.yml.j2 @@ -54,8 +54,11 @@ node_custom_config: "{{ kolla_node_custom_config_path }}" #docker_registry: "172.16.0.10:4000" docker_namespace: "{{ kolla_docker_namespace }}" -#docker_registry_username: "sam" -#docker_registry_password: "correcthorsebatterystaple" +{% if kolla_docker_namespace_username and kolla_docker_namespace_password %} +docker_registry_username: "{{ kolla_docker_namespace_username }}" +docker_registry_password: "{{ kolla_docker_namespace_password }}" +{% endif %} + #################### From d35d13962981911054885a9888044bda6907b48d Mon Sep 17 00:00:00 2001 From: ktibi Date: Wed, 25 Oct 2017 12:15:33 +0200 Subject: [PATCH 2/9] Update kolla --- ansible/group_vars/all/kolla | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla index 24340b2f7..53c8a9cd8 100644 --- a/ansible/group_vars/all/kolla +++ b/ansible/group_vars/all/kolla @@ -55,6 +55,12 @@ kolla_install_type: "binary" # Docker namespace to use for Kolla images. kolla_docker_namespace: "stackhpc" +# Username to use to access a docker registry. +kolla_docker_namespace_username: + +# Password to use to access a docker registry. +kolla_docker_namespace_password: + # Kolla OpenStack release version. This should be a Docker image tag. kolla_openstack_release: "5.0.0" From 7a80af0a8fee861645d7ffda8febcbc570603414 Mon Sep 17 00:00:00 2001 From: ktibi Date: Wed, 25 Oct 2017 12:17:58 +0200 Subject: [PATCH 3/9] Update kolla.yml --- etc/kayobe/kolla.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index e678f05d1..7564fb055 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -57,6 +57,12 @@ # Docker namespace to use for Kolla images. #kolla_docker_namespace: +# Username to use to access a docker registry. +#kolla_docker_namespace_username: + +# Password to use to access a docker registry. +#kolla_docker_namespace_password: + # Kolla OpenStack release version. This should be a Docker image tag. #kolla_openstack_release: From ab73d76845062a6a69c2985022be138fc7189b38 Mon Sep 17 00:00:00 2001 From: ktibi Date: Wed, 25 Oct 2017 15:06:19 +0200 Subject: [PATCH 4/9] Update container-image-build.yml --- ansible/container-image-build.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ansible/container-image-build.yml b/ansible/container-image-build.yml index ae53aec9e..4a8334487 100644 --- a/ansible/container-image-build.yml +++ b/ansible/container-image-build.yml @@ -8,6 +8,12 @@ # 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 tasks: - name: Set the container image sets to build if images regexes specified set_fact: From bbe324b9307b6862ac3a2dbaedff58d334dd8c8e Mon Sep 17 00:00:00 2001 From: ktibi Date: Wed, 25 Oct 2017 15:07:10 +0200 Subject: [PATCH 5/9] Update kolla --- ansible/group_vars/all/kolla | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla index 53c8a9cd8..9c265b1d9 100644 --- a/ansible/group_vars/all/kolla +++ b/ansible/group_vars/all/kolla @@ -56,10 +56,10 @@ kolla_install_type: "binary" kolla_docker_namespace: "stackhpc" # Username to use to access a docker registry. -kolla_docker_namespace_username: +kolla_docker_registry_username: # Password to use to access a docker registry. -kolla_docker_namespace_password: +kolla_docker_registry_password: # Kolla OpenStack release version. This should be a Docker image tag. kolla_openstack_release: "5.0.0" From 2709698a1e2e95f3e6152392e7983cdee1ba306e Mon Sep 17 00:00:00 2001 From: ktibi Date: Wed, 25 Oct 2017 15:07:48 +0200 Subject: [PATCH 6/9] Update kolla.yml --- etc/kayobe/kolla.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 7564fb055..46a05bcbb 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -58,10 +58,10 @@ #kolla_docker_namespace: # Username to use to access a docker registry. -#kolla_docker_namespace_username: +#kolla_docker_registry_username: # Password to use to access a docker registry. -#kolla_docker_namespace_password: +#kolla_docker_registry_password: # Kolla OpenStack release version. This should be a Docker image tag. #kolla_openstack_release: From adc08fe53912872aee78f53fcc23fe3286e5f22f Mon Sep 17 00:00:00 2001 From: ktibi Date: Wed, 25 Oct 2017 15:09:07 +0200 Subject: [PATCH 7/9] Update globals.yml.j2 --- ansible/roles/kolla-ansible/templates/globals.yml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/roles/kolla-ansible/templates/globals.yml.j2 b/ansible/roles/kolla-ansible/templates/globals.yml.j2 index d33c2211b..3fdc56ad6 100644 --- a/ansible/roles/kolla-ansible/templates/globals.yml.j2 +++ b/ansible/roles/kolla-ansible/templates/globals.yml.j2 @@ -55,8 +55,8 @@ node_custom_config: "{{ kolla_node_custom_config_path }}" #docker_registry: "172.16.0.10:4000" docker_namespace: "{{ kolla_docker_namespace }}" {% if kolla_docker_namespace_username and kolla_docker_namespace_password %} -docker_registry_username: "{{ kolla_docker_namespace_username }}" -docker_registry_password: "{{ kolla_docker_namespace_password }}" +docker_registry_username: "{{ kolla_docker_registry_username }}" +docker_registry_password: "{{ kolla_docker_registry_password }}" {% endif %} From 11e9827da24a4483853b5a94476870c5543e61fb Mon Sep 17 00:00:00 2001 From: ktibi Date: Wed, 25 Oct 2017 15:14:15 +0200 Subject: [PATCH 8/9] 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: > From 35cc193f533108eb3c4aacdebc8e4aa24f8a799f Mon Sep 17 00:00:00 2001 From: ktibi Date: Thu, 26 Oct 2017 10:24:53 +0200 Subject: [PATCH 9/9] Update container-image-build.yml --- ansible/container-image-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/container-image-build.yml b/ansible/container-image-build.yml index db6fb7656..78109ce0a 100644 --- a/ansible/container-image-build.yml +++ b/ansible/container-image-build.yml @@ -7,7 +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" + kolla_build_log_path: "/var/log/kolla-build.log" tasks: - name: Set the container image sets to build if images regexes specified set_fact: @@ -36,7 +36,7 @@ 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 + when: kolla_docker_registry_username is not none and kolla_docker_registry_password is not none - name: Ensure Kolla container images are built shell: >