openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "multinode-container-upgrade.yaml usable for mixed upgrade"

This commit is contained in:
Jenkins 2017-05-15 10:28:52 +00:00 committed by Gerrit Code Review
parent 0bf3c7ebb8 951d66abe4
commit 53a70d6aa7
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ci/environments/multinode-container-upgrade.yaml
View File

@ -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