19ed1afb2a
This consolidates the upgrade and ffwd-upgrade related env files,
removing no longer relevant files (like converge vs converge-docker).
In line with recent/ongoing work in tripleoclient [1][2] we now have
cli: overcloud [upgrade|update|ffwd-upgrade] [prepare|run|converge]
With this patch we can also change the set/unset of resource 'noop'
and move it from tripleo-common to python-tripleoclient, like I am
pointing at in related client review below. If others agree then I
will do the same with the upgrade-prepare and also the ffwd cli
in [3], i.e. add explicit inclusion of the upgrade-prepare.yaml
and then similarly include the upgrade-converge.yaml for the
upgrade/ffwd-upgrade converge cli.
Related:
I1288fe68ae8af02a5d77390d237ec467d88e43d2 python-tripleoclient
[1] 96ffa3a325
[2] https://review.openstack.org/#/c/558536/5/tripleoclient/v1/overcloud_update.py
[3] https://review.openstack.org/#/c/557937/4/tripleoclient/v1/overcloud_ffwd_upgrade.py@72
Change-Id: Icfe494e3219d6d6cd3251f75bb4329fc4d793c3c
19 lines
795 B
YAML
19 lines
795 B
YAML
# Environment file used in the first step of an overcloud upgrade.
|
|
# This file is required by the tripleoclient and not expected to be updated
|
|
# by the operator. Please use additional -e env.yaml.
|
|
resource_registry:
|
|
OS::TripleO::DeploymentSteps: OS::Heat::None
|
|
OS::TripleO::Tasks::*PreConfig: OS::Heat::None
|
|
OS::TripleO::Tasks::*PostConfig: OS::Heat::None
|
|
parameter_defaults:
|
|
UpgradeLevelNovaCompute: auto
|
|
UpgradeInitCommonCommand: |
|
|
#!/bin/bash
|
|
set -eu
|
|
yum install -y python-heat-agent-*
|
|
yum update -y ansible
|
|
yum install -y ansible-pacemaker
|
|
# Remove the element os-net-config config.json https://bugs.launchpad.net/tripleo/+bug/1758161/
|
|
rm /usr/libexec/os-apply-config/templates/etc/os-net-config/config.json || true
|
|
UpgradeRemoveUnusedPackages: false
|