Update environment files for Q upgrade and ffwd upgrade

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
This commit is contained in:
mandreou 2018-04-05 14:48:30 +03:00 committed by Marios Andreou
parent dd16bb969c
commit 7fb5171b5f
7 changed files with 34 additions and 46 deletions

View File

@ -0,0 +1,10 @@
# Environment file used in the last step of a ffwd 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::SoftwareDeployment: OS::Heat::StructuredDeployment
OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup
OS::Heat::SoftwareDeployment: OS::TripleO::Heat::SoftwareDeployment
OS::Heat::StructuredDeployment: OS::TripleO::Heat::StructuredDeployment
parameter_defaults:
StackUpdateType: ''

View File

@ -1,6 +1,6 @@
# NOTE(lyarwood): Required as these services were deprecated in O and then
# removed in P but will still be present in the initial N Overcloud stack at
# the start of a fast-forward upgrade.
# Environment file used in the first step of a ffwd 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::Services::Core: OS::Heat::None
OS::TripleO::Services::GlanceRegistry: OS::Heat::None
@ -13,6 +13,12 @@ resource_registry:
OS::TripleO::Services::CephMds: OS::Heat::None
OS::TripleO::Services::CephRbdMirror: OS::Heat::None
OS::TripleO::Services::CephRgw: OS::Heat::None
# Set the config-download environment for the stack update:
OS::TripleO::SoftwareDeployment: ../../config-download-structured.yaml
OS::Heat::SoftwareDeployment: ../../config-download-software.yaml
OS::Heat::StructuredDeployment: ../../config-download-structured.yaml
OS::TripleO::DeploymentSteps: OS::Heat::None
OS::TripleO::Ssh::KnownHostsDeployment: OS::Heat::None
OS::TripleO::Ssh::HostPubKey: OS::Heat::None
parameter_defaults:
StackUpdateType: FASTFORWARDUPGRADE

View File

@ -0,0 +1,9 @@
# Environment file used in the last 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::StructuredDeploymentGroup
parameter_defaults:
UpgradeLevelNovaCompute: ''
UpgradeInitCommonCommand: ''
UpgradeInitCommand: ''

View File

@ -1,17 +1,18 @@
# 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:
EnableConfigPurge: false
StackUpdateType: UPGRADE
UpgradeLevelNovaCompute: auto
UpgradeInitCommonCommand: |
#!/bin/bash
set -eu
# Pike to Queens, put any needed host-level workarounds here
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
MigrationSshPort: 22
UpgradeRemoveUnusedPackages: false

View File

@ -1,15 +0,0 @@
#DEPRECATED: This environment file was last used for upgrades to stable/pike.
parameter_defaults:
EnableConfigPurge: true
StackUpdateType: UPGRADE
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
MigrationSshPort: 22
UpgradeRemoveUnusedPackages: false

View File

@ -1,12 +0,0 @@
# Use this to reset any mappings only used for upgrades after the
# update of all nodes is completed
resource_registry:
OS::TripleO::PostDeploySteps: ../common/post.yaml
parameter_defaults:
EnableConfigPurge: false
StackUpdateType: ''
UpgradeLevelNovaCompute: ''
UpgradeInitCommonCommand: ''
UpgradeInitCommand: ''
MigrationSshPort: 2022
CephAnsiblePlaybook: /usr/share/ceph-ansible/infrastructure-playbooks/rolling_update.yml

View File

@ -1,11 +0,0 @@
# Use this to reset any mappings only used for upgrades after the
# update of all nodes is completed
resource_registry:
OS::TripleO::PostDeploySteps: ../common/post.yaml
parameter_defaults:
EnableConfigPurge: false
StackUpdateType: ''
UpgradeLevelNovaCompute: ''
UpgradeInitCommonCommand: ''
UpgradeInitCommand: ''
MigrationSshPort: 2022