Merge "Increase libvirt/qemu.conf max_files and max_processes"

[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 de62a50..f8c839d 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
@@ -37,6 +37,15 @@ parameters:
   MonitoringSubscriptionNeutronL3:
     default: 'overcloud-neutron-l3-agent'
     type: string
+  NeutronL3AgentLoggingSource:
+    type: json
+    default:
+      tag: openstack.neutron.agent.l3
+      path: /var/log/neutron/l3-agent.log
+
+conditions:
+
+  external_network_bridge_empty: {equals : [{get_param: NeutronExternalNetworkBridge}, "''"]}
 
 resources:
 
@@ -53,11 +62,20 @@ outputs:
     value:
       service_name: neutron_l3
       monitoring_subscription: {get_param: MonitoringSubscriptionNeutronL3}
+      logging_source: {get_param: NeutronL3AgentLoggingSource}
+      logging_groups:
+        - 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}
       step_config: |
         include tripleo::profile::base::neutron::l3