Merge "multinode-container-upgrade.yaml usable for mixed upgrade"
This commit is contained in:
commit
53a70d6aa7
@ -7,6 +7,13 @@ resource_registry:
|
||||
OS::TripleO::Controller::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.yaml
|
||||
OS::TripleO::Compute::Net::SoftwareConfig: ../common/net-config-multinode-os-net-config.yaml
|
||||
|
||||
# NOTE: This is needed because of upgrades from Ocata to Pike. We
|
||||
# deploy the initial environment with Ocata templates, and
|
||||
# overcloud-resource-registry.yaml there doesn't have this Docker
|
||||
# mapping at all. After we stop CI'ing Ocata->Pike upgrade, we can
|
||||
# remove this.
|
||||
OS::TripleO::Services::Docker: OS::Heat::None
|
||||
|
||||
parameter_defaults:
|
||||
ControllerServices:
|
||||
- OS::TripleO::Services::CephMon
|
||||
@ -46,6 +53,7 @@ parameter_defaults:
|
||||
- OS::TripleO::Services::SwiftRingBuilder
|
||||
- OS::TripleO::Services::Snmp
|
||||
- OS::TripleO::Services::Timezone
|
||||
- OS::TripleO::Services::TripleoPackages
|
||||
- OS::TripleO::Services::NovaCompute
|
||||
- OS::TripleO::Services::NovaLibvirt
|
||||
- OS::TripleO::Services::Sshd
|
||||
|
Loading…
x
Reference in New Issue
Block a user