X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fneutron-ovs-agent.yaml;h=a2f82a58455a4447fd97dfbb63839b86f2027ca3;hb=refs%2Fheads%2Fmaster;hp=76d5c2694ae61b106f317cfdce3e49b8140c5da4;hpb=aeb11f384fe8e221c9bd62b8b86ecb1da4003777;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml
index 76d5c269..a2f82a58 100644
--- a/puppet/services/neutron-ovs-agent.yaml
+++ b/puppet/services/neutron-ovs-agent.yaml
@@ -4,6 +4,10 @@ description: >
   OpenStack Neutron OVS agent configured with Puppet
 
 parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -28,8 +32,7 @@ parameters:
     type: json
   NeutronEnableL2Pop:
     type: string
-    description: >
-        Enable/disable the L2 population feature in the Neutron agents.
+    description: Enable/disable the L2 population feature in the Neutron agents.
     default: "False"
   NeutronBridgeMappings:
     description: >
@@ -43,8 +46,7 @@ parameters:
     default: "datacentre:br-ex"
   NeutronTunnelTypes:
     default: 'vxlan'
-    description: |
-        The tunnel types for the Neutron tenant network.
+    description: The tunnel types for the Neutron tenant network.
     type: comma_delimited_list
   NeutronAgentExtensions:
     default: "qos"
@@ -53,8 +55,7 @@ parameters:
     type: comma_delimited_list
   NeutronEnableDVR:
     default: False
-    description: |
-      Enable support for distributed routing in the OVS Agent.
+    description: Enable Neutron DVR.
     type: boolean
   NeutronEnableARPResponder:
     default: false
@@ -86,14 +87,19 @@ resources:
   NeutronBase:
     type: ./neutron-base.yaml
     properties:
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
       RoleName: {get_param: RoleName}
       RoleParameters: {get_param: RoleParameters}
 
-  OpenVswitchUpgrade:
-    type: ./openvswitch-upgrade.yaml
+  Ovs:
+    type: ./openvswitch.yaml
+    properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
+      EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
@@ -134,22 +140,19 @@ outputs:
       step_config: |
         include ::tripleo::profile::base::neutron::ovs
       upgrade_tasks:
-        yaql:
-          expression: $.data.ovs_upgrade + $.data.neutron_ovs_upgrade
-          data:
-            ovs_upgrade:
-              get_attr: [OpenVswitchUpgrade, role_data, upgrade_tasks]
-            neutron_ovs_upgrade:
-              - name: Check if neutron_ovs_agent is deployed
-                command: systemctl is-enabled neutron-openvswitch-agent
-                tags: common
-                ignore_errors: True
-                register: neutron_ovs_agent_enabled
-              - name: "PreUpgrade step0,validation: Check service neutron-openvswitch-agent is running"
-                shell: /usr/bin/systemctl show 'neutron-openvswitch-agent' --property ActiveState | grep '\bactive\b'
-                when: neutron_ovs_agent_enabled.rc == 0
-                tags: step0,validation
-              - name: Stop neutron_ovs_agent service
-                tags: step1
-                when: neutron_ovs_agent_enabled.rc == 0
-                service: name=neutron-openvswitch-agent state=stopped
+        list_concat:
+          - get_attr: [Ovs, role_data, upgrade_tasks]
+          -
+            - name: Check if neutron_ovs_agent is deployed
+              command: systemctl is-enabled neutron-openvswitch-agent
+              tags: common
+              ignore_errors: True
+              register: neutron_ovs_agent_enabled
+            - name: "PreUpgrade step0,validation: Check service neutron-openvswitch-agent is running"
+              shell: /usr/bin/systemctl show 'neutron-openvswitch-agent' --property ActiveState | grep '\bactive\b'
+              when: neutron_ovs_agent_enabled.rc == 0
+              tags: step0,validation
+            - name: Stop neutron_ovs_agent service
+              tags: step1
+              when: neutron_ovs_agent_enabled.rc == 0
+              service: name=neutron-openvswitch-agent state=stopped