openstack/tripleo-heat-templates
Code Issues Proposed changes

Comment parameters for registry in docker tls env

Browse Source 
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
This commit is contained in:
Martin André 2017-06-19 09:47:31 +02:00
parent 39ee601e77
commit 6d44f7245c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
environments/docker-services-tls-everywhere.yaml
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