Merge "Run local registry and prep cont at standalone" into stable/rocky
This commit is contained in:
commit
a19a0b0ad8
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue