aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/neutron-base.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/services/neutron-base.yaml')
-rw-r--r--puppet/services/neutron-base.yaml7
1 files changed, 5 insertions, 2 deletions
diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml
index 301759c7..c1134824 100644
--- a/puppet/services/neutron-base.yaml
+++ b/puppet/services/neutron-base.yaml
@@ -47,7 +47,7 @@ outputs:
role_data:
description: Role data for the Neutron base service.
value:
- service_name: neutron-base
+ service_name: neutron_base
config_settings:
neutron::rabbit_password: {get_param: RabbitPassword}
neutron::rabbit_user: {get_param: RabbitUserName}
@@ -61,4 +61,7 @@ outputs:
params:
PLUGINS: {get_param: NeutronServicePlugins}
neutron::debug: {get_param: Debug}
- neutron::host: '"%{::fqdn}"'
+ neutron::allow_overlapping_ips: true
+ neutron::rabbit_heartbeat_timeout_threshold: 60
+ neutron::host: '"%{::fqdn}"' #NOTE: extra quoting is needed
+ neutron::keystone::auth::tenant: 'service'