Merge "scenario003: containerize services for CI"
This commit is contained in:
commit
57c6d270a4
@ -6,11 +6,11 @@
|
|||||||
resource_registry:
|
resource_registry:
|
||||||
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||||
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode.yaml
|
||||||
OS::TripleO::Services::SaharaApi: ../../puppet/services/sahara-api.yaml
|
OS::TripleO::Services::SaharaApi: ../../docker/services/sahara-api.yaml
|
||||||
OS::TripleO::Services::SaharaEngine: ../../puppet/services/sahara-engine.yaml
|
OS::TripleO::Services::SaharaEngine: ../../docker/services/sahara-engine.yaml
|
||||||
OS::TripleO::Services::MistralApi: ../../puppet/services/mistral-api.yaml
|
OS::TripleO::Services::MistralApi: ../../docker/services/mistral-api.yaml
|
||||||
OS::TripleO::Services::MistralEngine: ../../puppet/services/mistral-engine.yaml
|
OS::TripleO::Services::MistralEngine: ../../docker/services/mistral-engine.yaml
|
||||||
OS::TripleO::Services::MistralExecutor: ../../puppet/services/mistral-executor.yaml
|
OS::TripleO::Services::MistralExecutor: ../../docker/services/mistral-executor.yaml
|
||||||
# NOTE: This is needed because of upgrades from Ocata to Pike. We
|
# NOTE: This is needed because of upgrades from Ocata to Pike. We
|
||||||
# deploy the initial environment with Ocata templates, and
|
# deploy the initial environment with Ocata templates, and
|
||||||
# overcloud-resource-registry.yaml there doesn't have this Docker
|
# overcloud-resource-registry.yaml there doesn't have this Docker
|
||||||
|
Loading…
Reference in New Issue
Block a user