X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fneutron-sriov-agent.yaml;h=5c52ecfc0b57c0cec14a31ff00743e4c1af14bde;hb=5e22400b5ccecc3dcbe019af91263fc0aff73661;hp=090640eda53c86480b2ab7e902167b2226d28572;hpb=0354927a1143dd766cab4b9a88d4af84e404d6d9;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/neutron-sriov-agent.yaml b/puppet/services/neutron-sriov-agent.yaml
index 090640ed..5c52ecfc 100644
--- a/puppet/services/neutron-sriov-agent.yaml
+++ b/puppet/services/neutron-sriov-agent.yaml
@@ -4,6 +4,10 @@ description: >
   OpenStack Neutron SR-IOV nic agent configured with Puppet
 
 parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: >
@@ -59,6 +63,7 @@ resources:
   NeutronBase:
     type: ./neutron-base.yaml
     properties:
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
@@ -94,3 +99,17 @@ outputs:
           - get_attr: [RoleParametersValue, value]
       step_config: |
         include ::tripleo::profile::base::neutron::sriov
+      upgrade_tasks:
+        - name: Check if neutron_sriov_agent is deployed
+          command: systemctl is-enabled neutron-sriov-nic-agent
+          tags: common
+          ignore_errors: True
+          register: neutron_sriov_nic_agent_enabled
+        - name: "PreUpgrade step0,validation: Check service neutron-server is running"
+          shell: /usr/bin/systemctl show 'neutron-sriov-nic-agent' --property ActiveState | grep '\bactive\b'
+          when: neutron_sriov_nic_agent_enabled.rc == 0
+          tags: step0,validation
+        - name: Stop neutron_sriov_nic_agent service
+          tags: step1
+          when: neutron_sriov_nic_agent_enabled.rc == 0
+          service: name=neutron-sriov-nic-agent state=stopped