From 2887c6d2e4d511888d9156668e2b75b48d58add8 Mon Sep 17 00:00:00 2001
From: Vladislav Belogrudov <vladislav.belogrudov@oracle.com>
Date: Thu, 30 Jul 2015 16:49:35 +0300
Subject: [PATCH] Add missing slash if docker registry is specified
If user specifies registry a full image name is constructed by
concatenation of the registry, namespace and image. Currently
concatenation does not include '/' if registry is non-empty but
it should. If registry is empty '/' is not required.
This fix covers both use cases with help of Ansible filter.
Change-Id: I0588dd0da55d777e6caa7eb47d51b2435d38d5e0
Closes-Bug: #1479013
---
ansible/roles/glance/defaults/main.yml | 2 +-
ansible/roles/haproxy/defaults/main.yml | 4 ++--
ansible/roles/keystone/defaults/main.yml | 2 +-
ansible/roles/mariadb/defaults/main.yml | 2 +-
ansible/roles/neutron/defaults/main.yml | 2 +-
ansible/roles/nova/defaults/main.yml | 2 +-
ansible/roles/rabbitmq/defaults/main.yml | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ansible/roles/glance/defaults/main.yml b/ansible/roles/glance/defaults/main.yml
index cce4f70fd8..8c33f9d754 100644
--- a/ansible/roles/glance/defaults/main.yml
+++ b/ansible/roles/glance/defaults/main.yml
@@ -17,7 +17,7 @@ service_database_password: "{{ glance_database_password }}"
####################
# Docker
####################
-docker_glance_registry: "{{ docker_registry }}"
+docker_glance_registry: "{{ docker_registry ~ '/' if docker_registry else '' }}"
docker_glance_namespace: "{{ docker_namespace }}"
kolla_glance_base_distro: "{{ kolla_base_distro }}"
kolla_glance_install_type: "{{ kolla_install_type }}"
diff --git a/ansible/roles/haproxy/defaults/main.yml b/ansible/roles/haproxy/defaults/main.yml
index 910ddd4c89..e781743512 100755
--- a/ansible/roles/haproxy/defaults/main.yml
+++ b/ansible/roles/haproxy/defaults/main.yml
@@ -5,7 +5,7 @@ project_name: "haproxy"
####################
# Docker
####################
-docker_haproxy_registry: "{{ docker_registry }}"
+docker_haproxy_registry: "{{ docker_registry ~ '/' if docker_registry else '' }}"
docker_haproxy_namespace: "{{ docker_namespace }}"
kolla_haproxy_base_distro: "{{ kolla_base_distro }}"
kolla_haproxy_install_type: "{{ kolla_install_type }}"
@@ -16,7 +16,7 @@ docker_haproxy_tag: "{{ openstack_release }}"
docker_haproxy_image_full: "{{ docker_haproxy_image }}:{{ docker_haproxy_tag }}"
-docker_keepalived_registry: "{{ docker_registry }}"
+docker_keepalived_registry: "{{ docker_registry ~ '/' if docker_registry else '' }}"
docker_keepalived_namespace: "{{ docker_namespace }}"
kolla_keepalived_base_distro: "{{ kolla_base_distro }}"
kolla_keepalived_install_type: "{{ kolla_install_type }}"
diff --git a/ansible/roles/keystone/defaults/main.yml b/ansible/roles/keystone/defaults/main.yml
index d3b4f3cb13..a64c31fa42 100644
--- a/ansible/roles/keystone/defaults/main.yml
+++ b/ansible/roles/keystone/defaults/main.yml
@@ -17,7 +17,7 @@ service_database_password: "{{ keystone_database_password }}"
####################
# Docker
####################
-docker_keystone_registry: "{{ docker_registry }}"
+docker_keystone_registry: "{{ docker_registry ~ '/' if docker_registry else '' }}"
docker_keystone_namespace: "{{ docker_namespace }}"
kolla_keystone_base_distro: "{{ kolla_base_distro }}"
kolla_keystone_install_type: "{{ kolla_install_type }}"
diff --git a/ansible/roles/mariadb/defaults/main.yml b/ansible/roles/mariadb/defaults/main.yml
index 469ad83550..cb0ddbd9b1 100644
--- a/ansible/roles/mariadb/defaults/main.yml
+++ b/ansible/roles/mariadb/defaults/main.yml
@@ -10,7 +10,7 @@ database_cluster_name: "kolla"
####################
# Docker
####################
-docker_database_registry: "{{ docker_registry }}"
+docker_database_registry: "{{ docker_registry ~ '/' if docker_registry else '' }}"
docker_database_namespace: "{{ docker_namespace }}"
kolla_database_base_distro: "{{ kolla_base_distro }}"
kolla_database_install_type: "{{ kolla_install_type }}"
diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml
index bc4b272655..f7e37a1899 100644
--- a/ansible/roles/neutron/defaults/main.yml
+++ b/ansible/roles/neutron/defaults/main.yml
@@ -17,7 +17,7 @@ service_database_password: "{{ neutron_database_password }}"
####################
# Docker
####################
-docker_neutron_registry: "{{ docker_registry }}"
+docker_neutron_registry: "{{ docker_registry ~ '/' if docker_registry else '' }}"
docker_neutron_namespace: "{{ docker_namespace }}"
kolla_neutron_base_distro: "{{ kolla_base_distro }}"
kolla_neutron_install_type: "{{ kolla_install_type }}"
diff --git a/ansible/roles/nova/defaults/main.yml b/ansible/roles/nova/defaults/main.yml
index 82490ac633..9f3284f1c2 100644
--- a/ansible/roles/nova/defaults/main.yml
+++ b/ansible/roles/nova/defaults/main.yml
@@ -17,7 +17,7 @@ service_database_password: "{{ nova_database_password }}"
####################
# Docker
####################
-docker_nova_registry: "{{ docker_registry }}"
+docker_nova_registry: "{{ docker_registry ~ '/' if docker_registry else '' }}"
docker_nova_namespace: "{{ docker_namespace }}"
kolla_nova_base_distro: "{{ kolla_base_distro }}"
kolla_nova_install_type: "{{ kolla_install_type }}"
diff --git a/ansible/roles/rabbitmq/defaults/main.yml b/ansible/roles/rabbitmq/defaults/main.yml
index 67dd88364a..d988806154 100644
--- a/ansible/roles/rabbitmq/defaults/main.yml
+++ b/ansible/roles/rabbitmq/defaults/main.yml
@@ -4,7 +4,7 @@ project_name: "rabbitmq"
####################
# Docker
####################
-docker_message_broker_registry: "{{ docker_registry }}"
+docker_message_broker_registry: "{{ docker_registry ~ '/' if docker_registry else '' }}"
docker_message_broker_namespace: "{{ docker_namespace }}"
kolla_message_broker_base_distro: "{{ kolla_base_distro }}"
kolla_message_broker_install_type: "{{ kolla_install_type }}"