openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Drop ComputeServices from environments/docker.yaml"

Browse Source
This commit is contained in:
Jenkins 2017-07-13 04:09:03 +00:00 committed by Gerrit Code Review
commit fe3bf6271a
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
environments/docker-services-tls-everywhere.yaml
View File

@ -34,18 +34,3 @@ resource_registry:
OS::TripleO::PostDeploySteps: ../docker/post.yaml
OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml
parameter_defaults:
# 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
- OS::TripleO::Services::CertmongerUser
- OS::TripleO::Services::NovaCompute
- OS::TripleO::Services::NovaLibvirt
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker
- OS::TripleO::Services::Sshd

15
environments/docker.yaml
View File

@ -63,18 +63,3 @@ resource_registry:
OS::TripleO::PostDeploySteps: ../docker/post.yaml
OS::TripleO::PostUpgradeSteps: ../docker/post-upgrade.yaml
parameter_defaults:
# 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
- OS::TripleO::Services::NovaLibvirt
- OS::TripleO::Services::ComputeNeutronOvsAgent
- OS::TripleO::Services::Docker
- OS::TripleO::Services::CeilometerAgentCompute
- OS::TripleO::Services::Sshd
- OS::TripleO::Services::OpenDaylightOvs