aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/hieradata/controller.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/controller.yaml
parent02c7a6f12ba5648d3637fce6a57eb9eb4396a683 (diff)
parent2b2f0c263cd24d3b6f22ac594ddba6ce5ab4f75b (diff)
Merge "Adding core_plugin, type_drivers and service_plugins parameters"
Diffstat (limited to 'puppet/hieradata/controller.yaml')
-rw-r--r--puppet/hieradata/controller.yaml3
1 files changed, 0 insertions, 3 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml
index 3c5697e6..a66c1eaa 100644
--- a/puppet/hieradata/controller.yaml
+++ b/puppet/hieradata/controller.yaml
@@ -66,9 +66,6 @@ glance::backend::swift::swift_store_create_container_on_put: true
glance::backend::rbd::rbd_store_user: 'openstack'
# neutron
-neutron::core_plugin: 'ml2'
-neutron::service_plugins:
- - 'neutron.services.l3_router.l3_router_plugin.L3RouterPlugin'
neutron::server::sync_db: true
neutron::agents::dhcp::dnsmasq_config_file: /etc/neutron/dnsmasq-neutron.conf