From 3dde23105bc002be9d457538063e23505eff6788 Mon Sep 17 00:00:00 2001 From: Jiri Stransky Date: Fri, 1 Jul 2016 14:25:59 +0200 Subject: Stop no-opping PackageUpdate on upgrade After we fixed bug #1567384 and bug #1567385, we no longer need to no-op the PakageUpdate resource on upgrades. I removed the no-op in change Ie14ddbff15e7ed21aaa3fcdacf36e0040f912382 from major-upgrade-pacemaker-converge.yaml but didn't recall we had the no-op in major-upgrade-pacemaker{,-init}.yaml too. Change-Id: I24b913c790eae79e3b207729e0b22378075fb282 --- environments/major-upgrade-pacemaker-init.yaml | 1 - environments/major-upgrade-pacemaker.yaml | 1 - 2 files changed, 2 deletions(-) (limited to 'environments') diff --git a/environments/major-upgrade-pacemaker-init.yaml b/environments/major-upgrade-pacemaker-init.yaml index fbad0406..d97f8fc1 100644 --- a/environments/major-upgrade-pacemaker-init.yaml +++ b/environments/major-upgrade-pacemaker-init.yaml @@ -3,7 +3,6 @@ parameter_defaults: resource_registry: OS::TripleO::Tasks::UpdateWorkflow: ../extraconfig/tasks/major_upgrade_pacemaker_init.yaml - OS::TripleO::Tasks::PackageUpdate: ../extraconfig/tasks/yum_update_noop.yaml OS::TripleO::ControllerPostDeployment: OS::Heat::None OS::TripleO::ComputePostDeployment: OS::Heat::None OS::TripleO::ObjectStoragePostDeployment: OS::Heat::None diff --git a/environments/major-upgrade-pacemaker.yaml b/environments/major-upgrade-pacemaker.yaml index 763ca67e..95f09666 100644 --- a/environments/major-upgrade-pacemaker.yaml +++ b/environments/major-upgrade-pacemaker.yaml @@ -3,7 +3,6 @@ parameter_defaults: resource_registry: OS::TripleO::Tasks::UpdateWorkflow: ../extraconfig/tasks/major_upgrade_pacemaker.yaml - OS::TripleO::Tasks::PackageUpdate: ../extraconfig/tasks/yum_update_noop.yaml OS::TripleO::ControllerPostDeployment: OS::Heat::None OS::TripleO::ComputePostDeployment: OS::Heat::None OS::TripleO::ObjectStoragePostDeployment: OS::Heat::None -- cgit 1.2.3-korg