aboutsummaryrefslogtreecommitdiff
path: root/etc/kolla
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-19 15:53:18 +0000
committerGerrit Code Review <review@openstack.org>2016-10-19 15:53:18 +0000
commit5a08b48c5fe2ff90c90c1c0baa7b0fe113b6c8df (patch)
tree68e88cd772569415b9b6c50da84364df071dbd9a /etc/kolla
parentb0f1e00b0fa3dca3cde3964818016fb74212eefb (diff)
parent4ea452edb5389747ff31c2cb242619b98d25ec89 (diff)
downloadkolla-5a08b48c5fe2ff90c90c1c0baa7b0fe113b6c8df.tar.gz
kolla-5a08b48c5fe2ff90c90c1c0baa7b0fe113b6c8df.zip
Merge "Update globals.yml Docker registry example notes"
Diffstat (limited to 'etc/kolla')
-rw-r--r--etc/kolla/globals.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml
index 3e28250b4..ab5037eb4 100644
--- a/etc/kolla/globals.yml
+++ b/etc/kolla/globals.yml
@@ -47,7 +47,8 @@ kolla_internal_vip_address: "10.10.10.254"
####################
# Docker options
####################
-### Example: Private repository with authentication
+# 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"