Merge "Improve the README for the _setting keys"

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

diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml
index 8bd8d98..43657bd 100644 (file)
--- a/puppet/services/neutron-base.yaml
+++ b/puppet/services/neutron-base.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Neutron base service. Shared for all Neutron agents.
@@ -33,7 +33,7 @@ parameters:
         from neutron.core_plugins namespace.
     type: string
   NeutronServicePlugins:
-    default: "router,qos"
+    default: "router,qos,trunk"
     description: |
         Comma-separated list of service plugin entrypoints to be loaded from the
         neutron.service_plugins namespace.
@@ -42,11 +42,41 @@ parameters:
     type: string
     default: ''
     description: Set to True to enable debugging on all services.
+  EnableConfigPurge:
+    type: boolean
+    default: true
+    description: >
+        Remove configuration that is not generated by TripleO. Setting
+        to false may result in configuration remnants after updates/upgrades.
+  NeutronGlobalPhysnetMtu:
+    type: number
+    default: 1500
+    description: |
+        MTU of the underlying physical network. Neutron uses this value to
+        calculate MTU for all virtual network components. For flat and VLAN
+        networks, neutron uses this value without modification. For overlay
+        networks such as VXLAN, neutron automatically subtracts the overlay
+        protocol overhead from this value.
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
 
 outputs:
   role_data:
     description: Role data for the Neutron base service.
     value:
+      service_name: neutron_base
       config_settings:
         neutron::rabbit_password: {get_param: RabbitPassword}
         neutron::rabbit_user: {get_param: RabbitUserName}
@@ -54,9 +84,12 @@ outputs:
         neutron::rabbit_port: {get_param: RabbitClientPort}
         neutron::dhcp_agents_per_network: {get_param: NeutronDhcpAgentsPerNetwork}
         neutron::core_plugin: {get_param: NeutronCorePlugin}
-        neutron::service_plugins:
-          str_replace:
-            template: PLUGINS
-            params:
-              PLUGINS: {get_param: NeutronServicePlugins}
+        neutron::service_plugins: {get_param: NeutronServicePlugins}
         neutron::debug: {get_param: Debug}
+        neutron::purge_config: {get_param: EnableConfigPurge}
+        neutron::allow_overlapping_ips: true
+        neutron::rabbit_heartbeat_timeout_threshold: 60
+        neutron::host: '%{::fqdn}'
+        neutron::db::database_db_max_retries: -1
+        neutron::db::database_max_retries: -1
+        neutron::global_physnet_mtu: {get_param: NeutronGlobalPhysnetMtu}