summaryrefslogtreecommitdiffstats
path: root/puppet/hieradata/common.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'puppet/hieradata/common.yaml')
-rw-r--r--puppet/hieradata/common.yaml3
1 files changed, 1 insertions, 2 deletions
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 030f661d..b4b51abf 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -7,10 +7,9 @@ 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