X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fopendaylight-ovs.yaml;h=0d859be1d6b40a3aecf25a433d5162a96e630825;hb=321ecf916f51443dbc139356b709f2b9fdd970a1;hp=5cf416f3eb7206212a5f6ddd8ac6b4e524f770c1;hpb=a7c923700a3ae288ef8b8936a4aba74c8e18fd32;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/opendaylight-ovs.yaml b/puppet/services/opendaylight-ovs.yaml
index 5cf416f3..0d859be1 100644
--- a/puppet/services/opendaylight-ovs.yaml
+++ b/puppet/services/opendaylight-ovs.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenDaylight OVS Configuration.
@@ -47,6 +47,18 @@ parameters:
   DefaultPasswords:
     default: {}
     type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
+
+resources:
+  OpenVswitchUpgrade:
+    type: ./openvswitch-upgrade.yaml
 
 outputs:
   role_data:
@@ -70,16 +82,22 @@ outputs:
       step_config: |
         include tripleo::profile::base::neutron::plugins::ovs::opendaylight
       upgrade_tasks:
-        - name: Check if openvswitch is deployed
-          command: systemctl is-enabled openvswitch
-          tags: common
-          ignore_errors: True
-          register: openvswitch_enabled
-        - name: "PreUpgrade step0,validation: Check service openvswitch is running"
-          shell: /usr/bin/systemctl show 'openvswitch' --property ActiveState | grep '\bactive\b'
-          when: openvswitch_enabled.rc == 0
-          tags: step0,validation
-        - name: Stop openvswitch service
-          tags: step1
-          when: openvswitch_enabled.rc == 0
-          service: name=openvswitch state=stopped
+        yaql:
+          expression: $.data.ovs_upgrade + $.data.opendaylight_upgrade
+          data:
+            ovs_upgrade:
+              get_attr: [OpenVswitchUpgrade, role_data, upgrade_tasks]
+            opendaylight_upgrade:
+              - name: Check if openvswitch is deployed
+                command: systemctl is-enabled openvswitch
+                tags: common
+                ignore_errors: True
+                register: openvswitch_enabled
+              - name: "PreUpgrade step0,validation: Check service openvswitch is running"
+                shell: /usr/bin/systemctl show 'openvswitch' --property ActiveState | grep '\bactive\b'
+                when: openvswitch_enabled.rc == 0
+                tags: step0,validation
+              - name: Stop openvswitch service
+                tags: step1
+                when: openvswitch_enabled.rc == 0
+                service: name=openvswitch state=stopped