aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-04 08:14:54 +0000
committerGerrit Code Review <review@openstack.org>2016-07-04 08:14:54 +0000
commitcde98955ab5db7de403749d229af19cd760b2bd2 (patch)
tree213777f60fa06da49c35e0941322f92ee4c4b8ae
parentf733b2edd1721fb187d3f261e2d8d8ab3f40c9f1 (diff)
parent3dde23105bc002be9d457538063e23505eff6788 (diff)
Merge "Stop no-opping PackageUpdate on upgrade"
-rw-r--r--environments/major-upgrade-pacemaker-init.yaml1
-rw-r--r--environments/major-upgrade-pacemaker.yaml1
2 files changed, 0 insertions, 2 deletions
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