Merge "Remove deprecated hdp plugin and add ambari"

[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..bc8dd8d 100644 (file)
--- a/puppet/services/neutron-base.yaml
+++ b/puppet/services/neutron-base.yaml
@@ -42,11 +42,18 @@ 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.
 
 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}
@@ -60,3 +67,9 @@ outputs:
             params:
               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}"'    #NOTE: extra quoting is needed
+        neutron::db::database_db_max_retries: -1
+        neutron::db::database_max_retries: -1