X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=common%2Fmajor_upgrade_steps.j2.yaml;h=7fc91153d00ec991970e1d23b368529f5f6df3d6;hb=5d977e5e1bbf5eba378c9aaff02a44f747f642e6;hp=11113eec11e5da1b14b9b966e2ef46967e69d3b1;hpb=2614962c471ed4ab890383cb63836260227e0010;p=apex-tripleo-heat-templates.git

diff --git a/common/major_upgrade_steps.j2.yaml b/common/major_upgrade_steps.j2.yaml
index 11113eec..7fc91153 100644
--- a/common/major_upgrade_steps.j2.yaml
+++ b/common/major_upgrade_steps.j2.yaml
@@ -54,7 +54,6 @@ resources:
               params:
                 ROLE_NAME: {{role.name}}
           - get_file: ../extraconfig/tasks/pacemaker_common_functions.sh
-          - get_file: ../extraconfig/tasks/run_puppet.sh
           - get_file: ../extraconfig/tasks/tripleo_upgrade_node.sh
 
   {{role.name}}DeliverUpgradeScriptDeployment:
@@ -129,32 +128,6 @@ resources:
   {%- endfor %}
 {%- endfor %}
 
-# Dump the puppet manifests to be apply later when disable_upgrade_deployment
-# is to true
-{% for role in roles  if role.disable_upgrade_deployment|default(false) %}
-  {{role.name}}DeliverPuppetConfig:
-    type: OS::Heat::SoftwareConfig
-    properties:
-      group: script
-      config:
-        list_join:
-        - ''
-        - - str_replace:
-              template: |
-                #!/bin/bash
-                cat > /root/{{role.name}}_puppet_config.pp << ENDOFCAT
-                PUPPET_CLASSES
-                ENDOFCAT
-              params:
-                PUPPET_CLASSES: {get_param: [role_data, {{role.name}}, step_config]}
-
-  {{role.name}}DeliverPuppetDeployment:
-    type: OS::Heat::SoftwareDeploymentGroup
-    properties:
-      servers:  {get_param: [servers, {{role.name}}]}
-      config: {get_resource: {{role.name}}DeliverPuppetConfig}
-{% endfor %}
-
 # Upgrade Steps for all roles
 {%- for step in range(0, upgrade_steps_max) %}
   # Config resources for step {{step}}