We don't need to set a default for the CephX keys and cluster FSID

[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 d759d42..253a6bf 100644 (file)
--- a/puppet/services/neutron-server.yaml
+++ b/puppet/services/neutron-server.yaml
@@ -22,9 +22,9 @@ 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
@@ -39,6 +39,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]
@@ -66,10 +67,20 @@ outputs:
             neutron::server::notifications::password: {get_param: NovaPassword}
             neutron::db::mysql::password: {get_param: NeutronPassword}
             neutron::db::mysql::user: neutron
-            neutron::db::mysql::host: {get_param: [EndpointMap, MysqlInternal, host]}
+            neutron::db::mysql::host: {get_param: [EndpointMap, MysqlNoBracketsInternal, host]}
             neutron::db::mysql::dbname: ovs_neutron
             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
       step_config: |
         include tripleo::profile::base::neutron::server