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
Ping retry
[apex-tripleo-heat-templates.git]
/
puppet
/
hieradata
/
common.yaml
diff --git
a/puppet/hieradata/common.yaml
b/puppet/hieradata/common.yaml
index
52b2351
..
46471c3
100644
(file)
--- a/
puppet/hieradata/common.yaml
+++ b/
puppet/hieradata/common.yaml
@@
-3,13
+3,14
@@
ssh::server::storeconfigs_enabled: false
# ceilometer settings used by compute and controller ceilo auth settings
ceilometer::agent::auth::auth_region: 'regionOne'
# ceilometer settings used by compute and controller ceilo auth settings
ceilometer::agent::auth::auth_region: 'regionOne'
-# FIXME: Might be better to use 'service' tenant here but this requires
-# changes in the tripleo-incubator keystone role setup
-ceilometer::agent::auth::auth_tenant_name: 'admin'
+ceilometer::agent::auth::auth_tenant_name: 'service'
+
+aodh::auth::auth_region: 'regionOne'
+aodh::auth::auth_tenant_name: 'service'
nova::api::admin_tenant_name: 'service'
nova::api::admin_tenant_name: 'service'
-nova::network::neutron::neutron_
admin_tenan
t_name: 'service'
-nova::network::neutron::neutron_
admin_
username: 'neutron'
+nova::network::neutron::neutron_
projec
t_name: 'service'
+nova::network::neutron::neutron_username: 'neutron'
nova::network::neutron::dhcp_domain: ''
neutron::allow_overlapping_ips: true
nova::network::neutron::dhcp_domain: ''
neutron::allow_overlapping_ips: true
@@
-28,6
+29,13
@@
sysctl_settings:
value: 500000
net.netfilter.nf_conntrack_max:
value: 500000
value: 500000
net.netfilter.nf_conntrack_max:
value: 500000
+ # prevent neutron bridges from autoconfiguring ipv6 addresses
+ net.ipv6.conf.default.accept_ra:
+ value: 0
+ net.ipv6.conf.default.autoconf:
+ value: 0
+ net.core.netdev_max_backlog:
+ value: 10000
nova::rabbit_heartbeat_timeout_threshold: 60
neutron::rabbit_heartbeat_timeout_threshold: 60
nova::rabbit_heartbeat_timeout_threshold: 60
neutron::rabbit_heartbeat_timeout_threshold: 60