x
/
fuel-plugin-opendaylight
Code Issues Proposed changes

Merge "Disable unsupported dns extension_driver in ml2 config"

This commit is contained in:
Jenkins 2017-01-24 13:18:32 +00:00 committed by Gerrit Code Review
parent b9bb490b88 b560c2db8f
commit 6a9972f60a
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deployment_scripts/puppet/modules/opendaylight/lib/puppet/parser/functions/odl_hiera_overrides.rb
View File

@ -9,10 +9,17 @@ module Puppet::Parser::Functions
configuration = {}
mechanism_driver = odl['odl_v2'] ? 'opendaylight_v2' : 'opendaylight'
# The list of drivers that can be enabled can be found here
# https://github.com/openstack/networking-odl/blob/master/devstack/settings#L79
# or https://github.com/openstack/networking-odl/commit/9aab23a3c3fd8aa7ade1e8edc150dd24ee3f5948
# In Newton by default dns and port_security are enabled, but networking-odl doesn't support dns,
# and because of that floating IPs cannot be assigned. So we disable dns here.
extension_drivers = 'port_security'
ml2_plugin = {
'neutron_plugin_ml2' => {
'ml2/mechanism_drivers' => {'value' => mechanism_driver},
'ml2/extension_drivers' => {'value' => extension_drivers},
'ml2_odl/password' => {'value' => 'admin'},
'ml2_odl/username' => {'value' => 'admin'},
'ml2_odl/url' => {'value' => "http://#{mgmt_vip}:#{odl['rest_api_port']}/controller/nb/v2/neutron"}