diff --git a/environments/major-upgrade-pacemaker-converge.yaml b/environments/major-upgrade-pacemaker-converge.yaml
index dfcb9654f0..f023cb320f 100644
--- a/environments/major-upgrade-pacemaker-converge.yaml
+++ b/environments/major-upgrade-pacemaker-converge.yaml
@@ -1,6 +1,2 @@
 parameter_defaults:
-  UpdateIdentifier: 'true'
   UpgradeLevelNovaCompute: ''
-
-resource_registry:
-  OS::TripleO::Tasks::PackageUpdate:  ../extraconfig/tasks/yum_update_noop.yaml
diff --git a/extraconfig/tasks/pacemaker_resource_restart.sh b/extraconfig/tasks/pacemaker_resource_restart.sh
index d9d00554a8..b2e5be16e9 100755
--- a/extraconfig/tasks/pacemaker_resource_restart.sh
+++ b/extraconfig/tasks/pacemaker_resource_restart.sh
@@ -8,7 +8,7 @@ pacemaker_status=$(systemctl is-active pacemaker)
 # and we're updating the deployment (not creating).
 if [ "$pacemaker_status" = "active" -a \
      "$(hiera bootstrap_nodeid)" = "$(facter hostname)" -a \
-     "$(hiera update_identifier)" != "nil" ]; then
+     "$(hiera stack_action)" = "UPDATE" ]; then
 
     #ensure neutron constraints like
     #https://review.openstack.org/#/c/245093/
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index fed9dd31e6..ad10a8fc70 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -65,6 +65,12 @@ parameters:
     description: >
       Setting to a previously unused value during stack-update will trigger
       package update on all nodes
+  StackAction:
+    type: string
+    description: >
+      Heat action on performed top-level stack.
+    constraints:
+    - allowed_values: ['CREATE', 'UPDATE']
 
 resources:
 
@@ -293,6 +299,7 @@ resources:
 
                 deploy_identifier: {get_param: DeployIdentifier}
                 update_identifier: {get_param: UpdateIdentifier}
+                stack_action: {get_param: StackAction}
 
 outputs:
   config_id: