openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Run local registry and prep cont at standalone" into stable/rocky

This commit is contained in:
Zuul 2018-12-15 07:50:10 +00:00 committed by Gerrit Code Review
parent 080f7ba63b c7d10a55a6
commit a19a0b0ad8
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/standalone/standalone-tripleo.yaml
View File

@ -66,12 +66,14 @@ resource_registry:
OS::TripleO::Services::CeilometerAgentNotification: OS::Heat::None
OS::TripleO::Services::ComputeCeilometerAgent: OS::Heat::None
OS::TripleO::Services::Congress: OS::Heat::None
OS::TripleO::Services::ContainerImagePrepare: ../../puppet/services/container-image-prepare.yaml
OS::TripleO::Services::DesignateApi: OS::Heat::None
OS::TripleO::Services::DesignateCentral: OS::Heat::None
OS::TripleO::Services::DesignateMDNS: OS::Heat::None
OS::TripleO::Services::DesignateProducer: OS::Heat::None
OS::TripleO::Services::DesignateSink: OS::Heat::None
OS::TripleO::Services::DesignateWorker: OS::Heat::None
OS::TripleO::Services::DockerRegistry: ../../puppet/services/docker-registry.yaml
OS::TripleO::Services::GnocchiApi: OS::Heat::None
OS::TripleO::Services::GnocchiMetricd: OS::Heat::None
OS::TripleO::Services::GnocchiStatsd: OS::Heat::None

2
roles/Standalone.yaml
View File

@ -61,6 +61,7 @@
- OS::TripleO::Services::Collectd
- OS::TripleO::Services::ComputeCeilometerAgent
- OS::TripleO::Services::Congress
- OS::TripleO::Services::ContainerImagePrepare
- OS::TripleO::Services::ContainersLogrotateCrond
- OS::TripleO::Services::DesignateApi
- OS::TripleO::Services::DesignateCentral
@ -69,6 +70,7 @@
- OS::TripleO::Services::DesignateSink
- OS::TripleO::Services::DesignateWorker
- OS::TripleO::Services::Docker
- OS::TripleO::Services::DockerRegistry
- OS::TripleO::Services::Ec2Api
- OS::TripleO::Services::Etcd
- OS::TripleO::Services::ExternalSwiftProxy

4
sample-env-generator/standalone.yaml
View File

@ -59,6 +59,10 @@ environments:
OS::TripleO::Services::OpenStackClients: ../../puppet/services/openstack-clients.yaml
# Activate container image prepare
OS::TripleO::Services::ContainerImagePrepare: ../../puppet/services/container-image-prepare.yaml
OS::TripleO::Services::DockerRegistry: ../../puppet/services/docker-registry.yaml
# Disable non-openstack services that are enabled by default
OS::TripleO::Services::HAproxy: OS::Heat::None
OS::TripleO::Services::Keepalived: OS::Heat::None