From 91dac755c837a68141e70fae4f4bacc0c5a1ab33 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 3 Mar 2017 14:22:39 +0000
Subject: [PATCH] Allow Kolla's docker namespace to be configured

---
 ansible/group_vars/all/kolla                            | 3 +++
 ansible/roles/kolla-ansible/defaults/main.yml           | 3 +++
 ansible/roles/kolla-ansible/templates/globals.yml.j2    | 2 +-
 ansible/roles/kolla-build/defaults/main.yml             | 3 +++
 ansible/roles/kolla-build/templates/kolla-build.conf.j2 | 3 +++
 etc/kayobe/kolla.yml                                    | 3 +++
 6 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ansible/group_vars/all/kolla b/ansible/group_vars/all/kolla
index f4d3aea9a..aea1572ba 100644
--- a/ansible/group_vars/all/kolla
+++ b/ansible/group_vars/all/kolla
@@ -34,6 +34,9 @@ kolla_base_distro: "centos"
 # Kolla installation type: binary or source.
 kolla_install_type: "binary"
 
+# Docker namespace to use for Kolla images.
+kolla_docker_namespace: "kolla"
+
 # Kolla OpenStack release version. This should be a Docker image tag.
 kolla_openstack_release: "3.0.2"
 
diff --git a/ansible/roles/kolla-ansible/defaults/main.yml b/ansible/roles/kolla-ansible/defaults/main.yml
index 2338572fc..08a4b570a 100644
--- a/ansible/roles/kolla-ansible/defaults/main.yml
+++ b/ansible/roles/kolla-ansible/defaults/main.yml
@@ -27,6 +27,9 @@ kolla_base_distro:
 # Valid options are [ binary, source ]
 kolla_install_type:
 
+# Docker namespace to use for Kolla images.
+kolla_docker_namespace:
+
 # Valid option is Docker repository tag
 kolla_openstack_release:
 
diff --git a/ansible/roles/kolla-ansible/templates/globals.yml.j2 b/ansible/roles/kolla-ansible/templates/globals.yml.j2
index 5070f3564..24cf4891a 100644
--- a/ansible/roles/kolla-ansible/templates/globals.yml.j2
+++ b/ansible/roles/kolla-ansible/templates/globals.yml.j2
@@ -52,7 +52,7 @@ node_custom_config: "{{ kolla_node_custom_config_path }}"
 ### Example: Private repository with authentication
 
 #docker_registry: "172.16.0.10:4000"
-#docker_namespace: "companyname"
+docker_namespace: "{{ kolla_docker_namespace }}"
 #docker_registry_username: "sam"
 #docker_registry_password: "correcthorsebatterystaple"
 
diff --git a/ansible/roles/kolla-build/defaults/main.yml b/ansible/roles/kolla-build/defaults/main.yml
index ad57376ab..1fed37431 100644
--- a/ansible/roles/kolla-build/defaults/main.yml
+++ b/ansible/roles/kolla-build/defaults/main.yml
@@ -8,5 +8,8 @@ kolla_base_distro:
 # Valid options are [ binary, source ]
 kolla_install_type:
 
+# Docker namespace to use for Kolla images.
+kolla_docker_namespace:
+
 # Valid option is Docker repository tag
 kolla_openstack_release:
diff --git a/ansible/roles/kolla-build/templates/kolla-build.conf.j2 b/ansible/roles/kolla-build/templates/kolla-build.conf.j2
index f54e241df..017088367 100644
--- a/ansible/roles/kolla-build/templates/kolla-build.conf.j2
+++ b/ansible/roles/kolla-build/templates/kolla-build.conf.j2
@@ -8,6 +8,9 @@ base={{ kolla_base_distro }}
 # Method of OpenStack install. Valid options are [ binary, source ]
 type={{ kolla_install_type }}
 
+# Docker namespace to use for Kolla images.
+namespace={{ kolla_docker_namespace }}
+
 # Docker image tag to apply.
 tag={{ kolla_openstack_release }}
 
diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 90c0f9181..ff05d81ee 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -33,6 +33,9 @@
 # Kolla installation type: binary or source.
 #kolla_install_type:
 
+# Docker namespace to use for Kolla images.
+#kolla_docker_namespace:
+
 # Kolla OpenStack release version. This should be a Docker image tag.
 #kolla_openstack_release: