From 39321cca716b0f60c9226f96950eb3c41144a61a Mon Sep 17 00:00:00 2001 From: Jiri Stransky Date: Tue, 17 Jul 2018 12:42:59 +0200 Subject: [PATCH] Update/upgrade prepare/converge in config-download era We inherit the `prepare` commands from deploy, in Rocky we will automatically get config-download env file there so no need to explicitly disable DeploymentSteps in *-prepare.yaml files too. We should also disable the WorkflowSteps in config-download environment, as they too aren't meant to be used with config-download. Similarly, for `converge` commands in the *-converge.yaml files we shouldn't re-enable the DeploymentSteps and WorkflowSteps, as that would go against using config-download. Change-Id: I89f54ba9a0a15afd26da4d4b26aba8ef09ebf04b --- environments/config-download-environment.yaml | 1 + environments/lifecycle/ffwd-upgrade-converge.yaml | 6 ------ environments/lifecycle/ffwd-upgrade-prepare.yaml | 8 -------- environments/lifecycle/update-converge.yaml | 3 --- environments/lifecycle/update-prepare.yaml | 2 -- environments/lifecycle/upgrade-converge.yaml | 3 --- environments/lifecycle/upgrade-prepare.yaml | 4 ---- 7 files changed, 1 insertion(+), 26 deletions(-) diff --git a/environments/config-download-environment.yaml b/environments/config-download-environment.yaml index 29e366ecf5..cd1b57e207 100644 --- a/environments/config-download-environment.yaml +++ b/environments/config-download-environment.yaml @@ -8,6 +8,7 @@ resource_registry: 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 diff --git a/environments/lifecycle/ffwd-upgrade-converge.yaml b/environments/lifecycle/ffwd-upgrade-converge.yaml index 5a45ae7230..c726530518 100644 --- a/environments/lifecycle/ffwd-upgrade-converge.yaml +++ b/environments/lifecycle/ffwd-upgrade-converge.yaml @@ -1,12 +1,6 @@ # 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::TripleO::WorkflowSteps: OS::Mistral::ExternalResource - OS::Heat::SoftwareDeployment: OS::TripleO::Heat::SoftwareDeployment - OS::Heat::StructuredDeployment: OS::TripleO::Heat::StructuredDeployment parameter_defaults: CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample'] UpgradeLevelNovaCompute: '' diff --git a/environments/lifecycle/ffwd-upgrade-prepare.yaml b/environments/lifecycle/ffwd-upgrade-prepare.yaml index 4203499217..470413cea9 100644 --- a/environments/lifecycle/ffwd-upgrade-prepare.yaml +++ b/environments/lifecycle/ffwd-upgrade-prepare.yaml @@ -5,14 +5,6 @@ resource_registry: OS::TripleO::Services::Core: OS::Heat::None OS::TripleO::Services::GlanceRegistry: OS::Heat::None OS::TripleO::Services::VipHosts: 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 # Deprecated/Name changed services OS::TripleO::Services::FluentdClient: OS::Heat::None diff --git a/environments/lifecycle/update-converge.yaml b/environments/lifecycle/update-converge.yaml index 5871e65dd5..38a37c4b48 100644 --- a/environments/lifecycle/update-converge.yaml +++ b/environments/lifecycle/update-converge.yaml @@ -1,9 +1,6 @@ # Environment file used in the last step of an overcloud update. # This file is required by the tripleoclient and not expected to be updated # 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 parameter_defaults: CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample'] UpgradeLevelNovaCompute: '' diff --git a/environments/lifecycle/update-prepare.yaml b/environments/lifecycle/update-prepare.yaml index 6700b3405b..025f6d29ff 100644 --- a/environments/lifecycle/update-prepare.yaml +++ b/environments/lifecycle/update-prepare.yaml @@ -2,7 +2,5 @@ # This file is required by the tripleoclient and not expected to be updated # 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 388397c6ad..247ba0d90d 100644 --- a/environments/lifecycle/upgrade-converge.yaml +++ b/environments/lifecycle/upgrade-converge.yaml @@ -1,9 +1,6 @@ # 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 - OS::TripleO::WorkflowSteps: OS::Mistral::ExternalResource parameter_defaults: CephAnsiblePlaybook: ['/usr/share/ceph-ansible/site-docker.yml.sample'] UpgradeLevelNovaCompute: '' diff --git a/environments/lifecycle/upgrade-prepare.yaml b/environments/lifecycle/upgrade-prepare.yaml index a0ea2a2194..6ca124e74c 100644 --- a/environments/lifecycle/upgrade-prepare.yaml +++ b/environments/lifecycle/upgrade-prepare.yaml @@ -2,12 +2,8 @@ # 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::WorkflowSteps: OS::Heat::None OS::TripleO::Tasks::*PreConfig: OS::Heat::None OS::TripleO::Tasks::*PostConfig: OS::Heat::None - # Deprecated/Name changed services - OS::TripleO::Services::FluentdClient: OS::Heat::None parameter_defaults: UpgradeLevelNovaCompute: auto