From 06a6b56f1497a5beabcbef6bc6fdd58fb11134b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <radoslaw.piliszek@gmail.com>
Date: Sat, 28 Mar 2020 09:50:39 +0100
Subject: [PATCH] Be less confusing about custom Docker registry
Docker registry password is, by default, sourced from
passwords.yml file.
Cleans up globals.yml to make it clearer.
Also follows the "present defaults" behaviour of the other vars.
Change-Id: Icc993e82a6a435f948e3d17e410eb14717cb0e2d
---
etc/kolla/globals.yml | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index c31b9f39df..1d1eb4db93 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -55,14 +55,16 @@
################
# Docker options
################
-# Below is an example of a private repository with authentication. Note the
-# Docker registry password can also be set in the passwords.yml file.
-#docker_registry: "172.16.0.10:4000"
-#docker_namespace: "companyname"
-#docker_registry_insecure: "yes"
-#docker_registry_username: "sam"
-#docker_registry_password: "correcthorsebatterystaple"
+# Custom docker registry settings:
+#docker_registry:
+#docker_registry_insecure: "{{ 'yes' if docker_registry else 'no' }}"
+#docker_registry_username:
+# docker_registry_password is set in the passwords.yml file.
+
+# Namespace of images:
+#docker_namespace: "kolla"
+
# Docker client timeout in seconds.
#docker_client_timeout: 120