From 19be98ba07d9c8881d67a359b9c1a424f824e2ac Mon Sep 17 00:00:00 2001 From: Jiri Stransky Date: Mon, 16 Apr 2018 18:29:52 +0200 Subject: [PATCH] No-op Mistral workflow resources for update/upgrade/ffwd So far we haven't been disabling workflows for update/upgrade. We should disable them by default as they could have the potential to disrupt the update/upgrade/ffwd procedure. The main example of a thing we deploy via the workflow resources is Ceph. We decided no-opping ceph-ansible for the main update/upgrade/ffwd upgrade steps is the safest path forward and we'll update/upgrade Ceph it after the main procedure is finished. Change-Id: I34c7213ab7b70963ad2e50f7633b665fad70bde5 --- common/deploy-steps.j2 | 2 +- environments/lifecycle/ffwd-upgrade-converge.yaml | 1 + environments/lifecycle/ffwd-upgrade-prepare.yaml | 9 +-------- environments/lifecycle/update-converge.yaml | 1 + environments/lifecycle/update-prepare.yaml | 1 + environments/lifecycle/upgrade-converge.yaml | 1 + environments/lifecycle/upgrade-prepare.yaml | 1 + overcloud-resource-registry-puppet.j2.yaml | 1 + 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index 80bb1fa990..49e2895822 100644 --- a/common/deploy-steps.j2 +++ b/common/deploy-steps.j2 @@ -193,7 +193,7 @@ resources: {%- endfor %} WorkflowTasks_Step{{step}}_Execution: - type: OS::Mistral::ExternalResource + type: OS::TripleO::WorkflowSteps condition: WorkflowTasks_Step{{step}}_Enabled depends_on: WorkflowTasks_Step{{step}} properties: diff --git a/environments/lifecycle/ffwd-upgrade-converge.yaml b/environments/lifecycle/ffwd-upgrade-converge.yaml index 73f394c037..98d3f7226a 100644 --- a/environments/lifecycle/ffwd-upgrade-converge.yaml +++ b/environments/lifecycle/ffwd-upgrade-converge.yaml @@ -4,6 +4,7 @@ resource_registry: OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup + OS::TripleO::WorkflowSteps: OS::Mistral::ExternalResource OS::Heat::SoftwareDeployment: OS::TripleO::Heat::SoftwareDeployment OS::Heat::StructuredDeployment: OS::TripleO::Heat::StructuredDeployment parameter_defaults: diff --git a/environments/lifecycle/ffwd-upgrade-prepare.yaml b/environments/lifecycle/ffwd-upgrade-prepare.yaml index 7993dcab9f..746428cb3a 100644 --- a/environments/lifecycle/ffwd-upgrade-prepare.yaml +++ b/environments/lifecycle/ffwd-upgrade-prepare.yaml @@ -5,19 +5,12 @@ resource_registry: OS::TripleO::Services::Core: OS::Heat::None OS::TripleO::Services::GlanceRegistry: OS::Heat::None OS::TripleO::Services::VipHosts: OS::Heat::None - OS::TripleO::Services::CephExternal: OS::Heat::None - OS::TripleO::Services::CephMgr: OS::Heat::None - OS::TripleO::Services::CephMon: OS::Heat::None - OS::TripleO::Services::CephOSD: OS::Heat::None - OS::TripleO::Services::CephClient: OS::Heat::None - 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::WorkflowSteps: OS::Heat::None OS::TripleO::Ssh::KnownHostsDeployment: OS::Heat::None OS::TripleO::Ssh::HostPubKey: OS::Heat::None parameter_defaults: diff --git a/environments/lifecycle/update-converge.yaml b/environments/lifecycle/update-converge.yaml index a68063d269..66cf6a49f2 100644 --- a/environments/lifecycle/update-converge.yaml +++ b/environments/lifecycle/update-converge.yaml @@ -3,3 +3,4 @@ # by the operator. Please use additional -e env.yaml for customizations. resource_registry: OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup + OS::TripleO::WorkflowSteps: OS::Mistral::ExternalResource diff --git a/environments/lifecycle/update-prepare.yaml b/environments/lifecycle/update-prepare.yaml index 19a393dca3..6700b3405b 100644 --- a/environments/lifecycle/update-prepare.yaml +++ b/environments/lifecycle/update-prepare.yaml @@ -3,5 +3,6 @@ # by the operator. Please use additional -e env.yaml for customizations. resource_registry: OS::TripleO::DeploymentSteps: OS::Heat::None + OS::TripleO::WorkflowSteps: OS::Heat::None OS::TripleO::Tasks::*PreConfig: OS::Heat::None OS::TripleO::Tasks::*PostConfig: OS::Heat::None diff --git a/environments/lifecycle/upgrade-converge.yaml b/environments/lifecycle/upgrade-converge.yaml index 080ab06462..11ed0da419 100644 --- a/environments/lifecycle/upgrade-converge.yaml +++ b/environments/lifecycle/upgrade-converge.yaml @@ -3,6 +3,7 @@ # by the operator. Please use additional -e env.yaml. resource_registry: OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup + OS::TripleO::WorkflowSteps: OS::Mistral::ExternalResource parameter_defaults: UpgradeLevelNovaCompute: '' UpgradeInitCommonCommand: '' diff --git a/environments/lifecycle/upgrade-prepare.yaml b/environments/lifecycle/upgrade-prepare.yaml index a3ea8c2c92..70b394703a 100644 --- a/environments/lifecycle/upgrade-prepare.yaml +++ b/environments/lifecycle/upgrade-prepare.yaml @@ -3,6 +3,7 @@ # by the operator. Please use additional -e env.yaml. resource_registry: OS::TripleO::DeploymentSteps: OS::Heat::None + OS::TripleO::WorkflowSteps: OS::Heat::None OS::TripleO::Tasks::*PreConfig: OS::Heat::None OS::TripleO::Tasks::*PostConfig: OS::Heat::None parameter_defaults: diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index a0b0dc0acf..5ae1dec1d2 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -95,6 +95,7 @@ resource_registry: OS::TripleO::DeployedServerEnvironment: OS::Heat::None OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup + OS::TripleO::WorkflowSteps: OS::Mistral::ExternalResource # services OS::TripleO::Services: common/services.yaml