Revert "Deploy Aodh services, replacing Ceilometer Alarm"

[apex-tripleo-heat-templates.git] / puppet / hieradata / common.yaml

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 455f7f2..7a5e54d 100644 (file)
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -3,22 +3,17 @@ ssh::server::storeconfigs_enabled: false
 
 # 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'
 
-nova::network::neutron::neutron_admin_tenant_name: 'service'
-nova::network::neutron::neutron_admin_username: 'neutron'
-nova::network::neutron::vif_plugging_is_fatal: false
-nova::network::neutron::vif_plugging_timeout: 30
+nova::api::admin_tenant_name: 'service'
+nova::network::neutron::neutron_project_name: 'service'
+nova::network::neutron::neutron_username: 'neutron'
 nova::network::neutron::dhcp_domain: ''
 
 neutron::allow_overlapping_ips: true
-neutron::plugins::ml2::type_drivers:
-  - flat
-  - gre
-  - vxlan
-  - vlan
+
+kernel_modules:
+  nf_conntrack: {}
 
 sysctl_settings:
   net.ipv4.tcp_keepalive_intvl:
@@ -27,6 +22,15 @@ sysctl_settings:
     value: 5
   net.ipv4.tcp_keepalive_time:
     value: 5
+  net.nf_conntrack_max:
+    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
 
 nova::rabbit_heartbeat_timeout_threshold: 60
 neutron::rabbit_heartbeat_timeout_threshold: 60
@@ -34,3 +38,5 @@ cinder::rabbit_heartbeat_timeout_threshold: 60
 ceilometer::rabbit_heartbeat_timeout_threshold: 60
 heat::rabbit_heartbeat_timeout_threshold: 60
 keystone::rabbit_heartbeat_timeout_threshold: 60
+
+nova::cinder_catalog_info: 'volumev2:cinderv2:internalURL'