Browse Source

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
changes/66/561666/2
Jiri Stransky 4 years ago
parent
commit
19be98ba07
  1. 2
      common/deploy-steps.j2
  2. 1
      environments/lifecycle/ffwd-upgrade-converge.yaml
  3. 9
      environments/lifecycle/ffwd-upgrade-prepare.yaml
  4. 1
      environments/lifecycle/update-converge.yaml
  5. 1
      environments/lifecycle/update-prepare.yaml
  6. 1
      environments/lifecycle/upgrade-converge.yaml
  7. 1
      environments/lifecycle/upgrade-prepare.yaml
  8. 1
      overcloud-resource-registry-puppet.j2.yaml

2
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:

1
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:

9
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:

1
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

1
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

1
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: ''

1
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:

1
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

Loading…
Cancel
Save