From bd2b22500594df50ed8bb0908c5e887ac128bdf0 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 28 Jan 2019 09:58:14 +0000 Subject: [PATCH] Modify default of kolla_docker_registry Now uses the value of 'docker_registry', the default of which is unset. Change-Id: I564defbc661b6c100e9773826c03e3bc960adea7 Story: 2004873 Task: 29135 --- ansible/group_vars/all/kolla | 2 +- .../notes/kolla-docker-registry-e1adce280fc17db7.yaml | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/kolla-docker-registry-e1adce280fc17db7.yaml diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla index ae336a80f..80cc3564f 100644 --- a/ansible/group_vars/all/kolla +++ b/ansible/group_vars/all/kolla @@ -62,7 +62,7 @@ kolla_install_type: "binary" kolla_docker_namespace: "kolla" # Url of docker registry to use for Kolla images. -kolla_docker_registry: +kolla_docker_registry: "{{ docker_registry }}" # Username to use to access a docker registry. kolla_docker_registry_username: diff --git a/releasenotes/notes/kolla-docker-registry-e1adce280fc17db7.yaml b/releasenotes/notes/kolla-docker-registry-e1adce280fc17db7.yaml new file mode 100644 index 000000000..6be86a14c --- /dev/null +++ b/releasenotes/notes/kolla-docker-registry-e1adce280fc17db7.yaml @@ -0,0 +1,7 @@ +--- +upgrade: + - | + Modifies the default value of ``kolla_docker_registry`` variable to the + value of the ``docker_registry`` variable. The default value of + ``docker_registry`` is unset. This avoids needing to set the same value in + two places when a private Docker registry is in use.