diff options
| author |   Shiva Prasad Rao <shirvao@cisco.com> | 2015-08-20 16:35:59 -0400 |
|---|---|---|
| committer |   Shiva Prasad Rao <shivrao@cisco.com> | 2015-09-25 11:31:58 -0700 |
| commit | 2b2f0c263cd24d3b6f22ac594ddba6ce5ab4f75b (patch) | |
| tree | 751f4b89ee23033faea1b9ec2f0d322fe599e407 /puppet/hieradata | |
| parent | 760fba51566531bef50c2b54eff391dea41a49b6 (diff) | |
Adding core_plugin, type_drivers and service_plugins parameters
Make core_plugin, type_drivers and service_plugins parameter in
neutron configurable through heat.
Also changing the type_drivers order to "vxlan,vlan,flat,gre"
Change-Id: Iba895ed5897bdaf7bb772ffc063c424abb6e1638
Diffstat (limited to 'puppet/hieradata')
| -rw-r--r-- | puppet/hieradata/common.yaml | 5 | ||||
| -rw-r--r-- | puppet/hieradata/controller.yaml | 3 |
2 files changed, 0 insertions, 8 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: 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 |