Add environment file to enable DVR

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

diff --git a/puppet/services/neutron-server.yaml b/puppet/services/neutron-server.yaml
index 4303612..d64fd66 100644 (file)
--- a/puppet/services/neutron-server.yaml
+++ b/puppet/services/neutron-server.yaml
@@ -22,13 +22,17 @@ parameters:
     description: Allow automatic l3-agent failover
     type: string
   NeutronL3HA:
-    default: 'False'
-    description: Whether to enable l3-agent HA
-    type: string
+    default: false
+    description: Whether to enable HA for virtual routers
+    type: boolean
   NovaPassword:
     description: The password for the nova service and db account, used by nova-api.
     type: string
     hidden: true
+  NeutronEnableDVR:
+    description: Enable Neutron DVR.
+    default: false
+    type: boolean
 
 resources:
 
@@ -39,6 +43,7 @@ outputs:
   role_data:
     description: Role data for the Neutron Server agent service.
     value:
+      service_name: neutron_server
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]
@@ -50,9 +55,10 @@ outputs:
                   - {get_param: NeutronPassword}
                   - '@'
                   - {get_param: [EndpointMap, MysqlInternal, host]}
-                  - '/ovs_neutron?charset=utf8'
+                  - '/ovs_neutron'
             neutron::server::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri] }
             neutron::server::auth_url: {get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix]}
+            neutron::server::auth_tenant: 'service'
             neutron::server::identity_uri: { get_param: [EndpointMap, KeystoneAdmin, uri_no_suffix] }
             neutron::server::api_workers: {get_param: NeutronWorkers}
             neutron::server::allow_automatic_l3agent_failover: {get_param: NeutronAllowL3AgentFailover}
@@ -64,6 +70,8 @@ outputs:
             neutron::server::notifications::tenant_name: 'service'
             neutron::server::notifications::project_name: 'service'
             neutron::server::notifications::password: {get_param: NovaPassword}
+            neutron::server::project_name: 'service'
+            neutron::server::sync_db: true
             neutron::db::mysql::password: {get_param: NeutronPassword}
             neutron::db::mysql::user: neutron
             neutron::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]}
@@ -71,5 +79,16 @@ outputs:
             neutron::db::mysql::allowed_hosts:
               - '%'
               - "%{hiera('mysql_bind_host')}"
+            tripleo.neutron_server.firewall_rules:
+              '114 neutron server':
+                dport:
+                  - 9696
+                  - 13696
+              '118 neutron vxlan networks':
+                proto: 'udp'
+                dport: 4789
+              '106 vrrp':
+                proto: vrrp
+            neutron::server::router_distributed: {get_param: NeutronEnableDVR}
       step_config: |
         include tripleo::profile::base::neutron::server