summaryrefslogtreecommitdiffstats
path: root/environments
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2017-06-19 09:47:31 +0200
committerMartin André <m.andre@redhat.com>2017-06-19 09:47:31 +0200
commit6d44f7245ceec4b23145298702bffde1e6e21c1d (patch)
tree407660f1b40f604022efe3748b2ce41de467c800 /environments
parent39ee601e77b180bacbf57f8890bb517d3997b331 (diff)
Comment parameters for registry in docker tls env
This commit brings change from I3896fa2ea7caa603186f0af04f6d8382d50dd97a to docker-services-tls-everywhere.yaml, which original commit message was: These duplicate the defaults in puppet/services/docker.yaml and break things if you include an environment file (e.g that generated by quickstart containers-default-parameters.yaml) before the docker.yaml. Instead it's probably more helpful to include the commented lines showing how to enable use of a local docker registry. Change-Id: Ifa95ef60bc17bd2638ebb6aebf77a819b28c9f0b Related-Bug: #1691524
Diffstat (limited to 'environments')
-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 f1e3d96b..3ca04697 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