Merge "Set the name property for all deployment resources"

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

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index ab88a69..b4b51ab 100644 (file)
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -7,18 +7,12 @@ ceilometer::agent::auth::auth_region: 'regionOne'
 # changes in the tripleo-incubator keystone role setup
 ceilometer::agent::auth::auth_tenant_name: 'admin'
 
+nova::api::admin_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::network::neutron::dhcp_domain: ''
 
 neutron::allow_overlapping_ips: true
-neutron::plugins::ml2::type_drivers:
-  - flat
-  - gre
-  - vxlan
-  - vlan
 
 sysctl_settings:
   net.ipv4.tcp_keepalive_intvl:
@@ -33,3 +27,6 @@ neutron::rabbit_heartbeat_timeout_threshold: 60
 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'