aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/hieradata/compute.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-03-12 10:28:26 +0000
committerGerrit Code Review <review@openstack.org>2015-03-12 10:28:26 +0000
commit8772095c427c0c90747077271c70d84b16741359 (patch)
tree764b8541384dbb809655ccf1458a9eb02fcf6335 /puppet/hieradata/compute.yaml
parent925bd3864f693c890c84d69052fb03135a947b5c (diff)
parent10c2cfab45018aeb52f4f4b9499f5dc98b075d78 (diff)
Merge "Puppet: Configure neutron_api_class on controller"
Diffstat (limited to 'puppet/hieradata/compute.yaml')
-rw-r--r--puppet/hieradata/compute.yaml5
1 files changed, 0 insertions, 5 deletions
diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml
index ffa716a4..8d5c88fd 100644
--- a/puppet/hieradata/compute.yaml
+++ b/puppet/hieradata/compute.yaml
@@ -10,11 +10,6 @@ nova::compute::vnc_enabled: true
nova::compute::libvirt::vncserver_listen: '0.0.0.0'
nova::compute::libvirt::migration_support: true
-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
-
neutron::plugins::ml2::tunnel_id_ranges: ['1:1000']
ceilometer::agent::auth::auth_tenant_name: 'service'