X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fneutron-l3.yaml;h=6980355168df40384cb15b7b4dbd2051ecfb78d0;hb=10ba1fa6068978d5779da4b3c6966d73e893a7e5;hp=a2157555c79ea0d1f715640799f9f3811d9037c8;hpb=9cd0c5a50c45bfce9dabc64aafa3188ba9bdd13c;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/neutron-l3.yaml b/puppet/services/neutron-l3.yaml
index a2157555..69803551 100644
--- a/puppet/services/neutron-l3.yaml
+++ b/puppet/services/neutron-l3.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-10-14
+heat_template_version: ocata
 
 description: >
   OpenStack Neutron L3 agent configured with Puppet
@@ -68,15 +68,21 @@ outputs:
       config_settings:
         map_merge:
         - get_attr: [NeutronBase, role_data, config_settings]
-        - neutron::agents::l3::router_delete_namespaces: True
-          neutron::agents::l3::agent_mode: {get_param: NeutronL3AgentMode}
+        - neutron::agents::l3::agent_mode: {get_param: NeutronL3AgentMode}
           tripleo.neutron_l3.firewall_rules:
             '106 neutron_l3 vrrp':
               proto: vrrp
-        - 
+        -
           if:
           - external_network_bridge_empty
           - {}
           - neutron::agents::l3::external_network_bridge: {get_param: NeutronExternalNetworkBridge}
       step_config: |
         include tripleo::profile::base::neutron::l3
+      upgrade_tasks:
+        - name: "PreUpgrade step0,validation: Check service neutron-l3-agent is running"
+          shell: /usr/bin/systemctl show 'neutron-l3-agent' --property ActiveState | grep '\bactive\b'
+          tags: step0,validation
+        - name: Stop neutron_l3 service
+          tags: step2
+          service: name=neutron-l3-agent state=stopped