aboutsummaryrefslogtreecommitdiffstats
path: root/environments/docker.yaml
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2017-05-18 10:53:10 +0100
committerSteven Hardy <shardy@redhat.com>2017-05-18 10:53:10 +0100
commit47dfa57f5cc8a96cf0682eec226d68908819cc75 (patch)
treee828da40bbbf86da1df15f0a36964e482bd5e23d /environments/docker.yaml
parent5b4e1bc8239812df2aaccb0a270af7b5d3053c04 (diff)
Comment parameters for registry in docker.yaml
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: I3896fa2ea7caa603186f0af04f6d8382d50dd97a Closes-Bug: #1691524
Diffstat (limited to 'environments/docker.yaml')
-rw-r--r--environments/docker.yaml8
1 files changed, 4 insertions, 4 deletions
diff --git a/environments/docker.yaml b/environments/docker.yaml
index 991e991..d3372b2 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -51,10 +51,10 @@ resource_registry:
OS::TripleO::Services: ../docker/services/services.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::NovaCompute