Change flat network name for nosdn fdio scenario

[apex-tripleo-heat-templates.git] / puppet / services / openvswitch.yaml

diff --git a/puppet/services/openvswitch.yaml b/puppet/services/openvswitch.yaml
index 36aa5db..6479d7f 100644 (file)
--- a/puppet/services/openvswitch.yaml
+++ b/puppet/services/openvswitch.yaml
@@ -4,6 +4,10 @@ description: >
   Open vSwitch Configuration
 
 parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -159,6 +163,8 @@ outputs:
                 owner: root
                 group: root
                 mode: 0750
+            - name: Make yum cache.
+              command: yum makecache
             - name: Download OVS packages.
               command: yumdownloader --destdir /root/OVS_UPGRADE --resolve openvswitch
             - name: Get rpm list for manual upgrade of OVS.
@@ -173,6 +179,6 @@ outputs:
               with_items:
                 - "{{ovs_list_of_rpms.stdout_lines}}"
           tags: step2
-          when: "'2.5.0-14' in '{{ovs_version.stdout}}'
+          when: "'2.5.0-14' in ovs_version.stdout|default('')
                 or
-                ovs_packaging_issue|succeeded"
+                ovs_packaging_issue|default(false)|succeeded"