Merge "Add IP to provisioning interface for FreeIPA if requested"

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

diff --git a/puppet/services/neutron-l3.yaml b/puppet/services/neutron-l3.yaml
index a89e3d7..b3d7b3b 100644 (file)
--- a/puppet/services/neutron-l3.yaml
+++ b/puppet/services/neutron-l3.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Neutron L3 agent configured with Puppet
@@ -43,6 +43,10 @@ parameters:
       tag: openstack.neutron.agent.l3
       path: /var/log/neutron/l3-agent.log
 
+conditions:
+
+  external_network_bridge_empty: {equals : [{get_param: NeutronExternalNetworkBridge}, "''"]}
+
 resources:
 
   NeutronBase:
@@ -63,12 +67,22 @@ outputs:
         - neutron
       config_settings:
         map_merge:
-          - get_attr: [NeutronBase, role_data, config_settings]
+        - get_attr: [NeutronBase, role_data, config_settings]
+        - 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}
-            neutron::agents::l3::router_delete_namespaces: True
-            neutron::agents::l3::agent_mode : {get_param: NeutronL3AgentMode}
-            tripleo.neutron_l3.firewall_rules:
-              '106 neutron_l3 vrrp':
-                proto: vrrp
       step_config: |
         include tripleo::profile::base::neutron::l3
+      upgrade_tasks:
+        - name: Stop neutron_l3 service
+          tags: step2
+          service: name=neutron-l3-agent state=stopped
+        - name: Start neutron_l3 service
+          tags: step6
+          service: name=neutron-l3-agent state=started