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 6343a5e..d64fd66 100644 (file)
--- a/puppet/services/neutron-server.yaml
+++ b/puppet/services/neutron-server.yaml
@@ -29,6 +29,10 @@ parameters:
     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,7 +43,7 @@ outputs:
   role_data:
     description: Role data for the Neutron Server agent service.
     value:
-      service_name: neutron-server
+      service_name: neutron_server
       config_settings:
         map_merge:
           - get_attr: [NeutronBase, role_data, config_settings]
@@ -51,7 +55,7 @@ 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'
@@ -85,5 +89,6 @@ outputs:
                 dport: 4789
               '106 vrrp':
                 proto: vrrp
+            neutron::server::router_distributed: {get_param: NeutronEnableDVR}
       step_config: |
         include tripleo::profile::base::neutron::server