diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-05-15 10:28:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-05-15 10:28:52 +0000 |
| commit | 53a70d6aa705702e275f2068fc0cc35413236acc (patch) | |
| tree | 74b631fb0ab7103bbb5f0d7e62880c182b4edda3 | |
| parent | 0bf3c7ebb85536d1b90c73e54a0d7fc61aae989b (diff) | |
| parent | 951d66abe4e0811c6dc23d0d7281be7279d283f8 (diff) | |
Merge "multinode-container-upgrade.yaml usable for mixed upgrade"
| -rw-r--r-- | ci/environments/multinode-container-upgrade.yaml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ci/environments/multinode-container-upgrade.yaml b/ci/environments/multinode-container-upgrade.yaml index df60a6e3..89970419 100644 --- a/ci/environments/multinode-container-upgrade.yaml +++ b/ci/environments/multinode-container-upgrade.yaml @@ -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 |