From: Jiri Stransky Date: Thu, 4 May 2017 16:26:18 +0000 (+0200) Subject: multinode-container-upgrade.yaml usable for mixed upgrade X-Git-Tag: opnfv-6.0.0~673^2 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=951d66abe4e0811c6dc23d0d7281be7279d283f8;p=apex-tripleo-heat-templates.git multinode-container-upgrade.yaml usable for mixed upgrade We need Docker service mapping defined and set to OS::Heat::None so that we can reuse multinode-container-upgrade.yaml service list both for initial deployment and for the upgrade. The upgrade will not be broken by this as its env files are being passed later on the command line, and they'll take priority and effectively enable the Docker service on upgrade. Another change we need for mixed upgrade is to add the TripleoPackages service, which will take care of updating RPMs on the bare metal and prevent docker installation from failing with outdated puppet-tripleo ("Could not find class ::tripleo::profile::base::docker"). Related-Bug: #1685795 Closes-Bug: #1689772 Change-Id: Idb6917f22d0e9f74f8853972c6a08bffb01be410 --- 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