aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-20 04:04:48 +0000
committerGerrit Code Review <review@openstack.org>2017-06-20 04:04:48 +0000
commitf3b2e144302a9d7a4b95a26b3de3422de43393b0 (patch)
tree9112f6360c88a82111f85f2e33dbeefa92273832
parent27a92d279e623b96550310354f3b83fea82fef87 (diff)
parent6d44f7245ceec4b23145298702bffde1e6e21c1d (diff)
Merge "Comment parameters for registry in docker tls env"
-rw-r--r--environments/docker-services-tls-everywhere.yaml8
1 files changed, 4 insertions, 4 deletions
diff --git a/environments/docker-services-tls-everywhere.yaml b/environments/docker-services-tls-everywhere.yaml
index f1e3d96..3ca0469 100644
--- a/environments/docker-services-tls-everywhere.yaml
+++ b/environments/docker-services-tls-everywhere.yaml
@@ -36,10 +36,10 @@ resource_registry:
OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml
parameter_defaults:
- # Defaults to 'tripleoupstream'. Specify a local docker registry
- # Example: 192.168.24.1:8787/tripleoupstream
- DockerNamespace: tripleoupstream
- DockerNamespaceIsRegistry: false
+ # To specify a local docker registry, enable these
+ # where 192.168.24.1 is the host running docker-distribution
+ #DockerNamespace: 192.168.24.1:8787/tripleoupstream
+ #DockerNamespaceIsRegistry: true
ComputeServices:
- OS::TripleO::Services::CACerts