summaryrefslogtreecommitdiffstats
path: root/puppet/hieradata/common.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-09-28 17:40:43 +0000
committerGerrit Code Review <review@openstack.org>2015-09-28 17:40:43 +0000
commit9e918a4a517f62d4417909311041e3e54a726462 (patch)
treecc12aec5e1b2ded61798b09db0bf8951329a6ba5 /puppet/hieradata/common.yaml
parent02c7a6f12ba5648d3637fce6a57eb9eb4396a683 (diff)
parent2b2f0c263cd24d3b6f22ac594ddba6ce5ab4f75b (diff)
Merge "Adding core_plugin, type_drivers and service_plugins parameters"
Diffstat (limited to 'puppet/hieradata/common.yaml')
-rw-r--r--puppet/hieradata/common.yaml5
1 files changed, 0 insertions, 5 deletions
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 455f7f22..4a872d57 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -14,11 +14,6 @@ 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: