Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Move neutron's kestone::auth parameters to server profile
[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
7143cd9
..
f6339c8
100644
(file)
--- 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:
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}
config_settings:
neutron::rabbit_password: {get_param: RabbitPassword}
neutron::rabbit_user: {get_param: RabbitUserName}
@@
-61,3
+61,8
@@
outputs:
params:
PLUGINS: {get_param: NeutronServicePlugins}
neutron::debug: {get_param: Debug}
params:
PLUGINS: {get_param: NeutronServicePlugins}
neutron::debug: {get_param: Debug}
+ 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