Merge "Comment parameters for registry in docker tls env"

This commit is contained in:
Jenkins 2017-06-20 04:04:48 +00:00 committed by Gerrit Code Review
commit f3b2e14430

View File

@ -36,10 +36,10 @@ resource_registry:
OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml
parameter_defaults: parameter_defaults:
# Defaults to 'tripleoupstream'. Specify a local docker registry # To specify a local docker registry, enable these
# Example: 192.168.24.1:8787/tripleoupstream # where 192.168.24.1 is the host running docker-distribution
DockerNamespace: tripleoupstream #DockerNamespace: 192.168.24.1:8787/tripleoupstream
DockerNamespaceIsRegistry: false #DockerNamespaceIsRegistry: true
ComputeServices: ComputeServices:
- OS::TripleO::Services::CACerts - OS::TripleO::Services::CACerts