aboutsummaryrefslogtreecommitdiffstats
path: root/environments/docker.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-20 01:15:08 +0000
committerGerrit Code Review <review@openstack.org>2017-05-20 01:15:08 +0000
commit4065a5e27b4ec172b5204cce358bca0cff6ec11a (patch)
tree2bef6824d4f168a904ae23f8b62ce01add4a5939 /environments/docker.yaml
parentcdbc8e8d1dbe63d194f6e3cfab2ae215d37513a0 (diff)
parent47dfa57f5cc8a96cf0682eec226d68908819cc75 (diff)
Merge "Comment parameters for registry in docker.yaml"
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 94b4bcd..cbd5b68 100644
--- a/environments/docker.yaml
+++ b/environments/docker.yaml
@@ -52,10 +52,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