diff options
author | Feng Pan <fpan@redhat.com> | 2017-02-08 13:42:42 -0500 |
---|---|---|
committer | Feng Pan <fpan@redhat.com> | 2017-02-18 01:38:25 +0000 |
commit | c7e6d15b4d2570c7f9d2bc8dcfc57d8a68fede71 (patch) | |
tree | 81dcdb87979d37fa4bf061e92db79d88dd7c6f82 /build/puppet-neutron-add-odl-settings.patch | |
parent | 89f0410672d80015c419f77e69a5bb155cac2bfe (diff) |
Add support for odl-fdio scenario
Changes:
- Kernel parameters are now set through first-boot.yaml during deployment. No custom
images will be built. Note that all nodes will be configured the same way, we only
use compute's kernel parameter settings currently (from deploy settings file)
- Add support for VPP interface type in network settings file, it is now possible
to specify vpp_interface type and uio_driver for tenant nic in network settings
file. A new example config, network_settings_vpp.yaml is added.
- Add support for odl_l2-fdio scenario.
Limitations:
- Physical NIC names must be specified in network settings file, numbered nic names
such as nic1 are not supported for fdio scenarios.
- The same kernel parameters will be configured for all nodes. The paramters will be
taken from compute kernel parameter section in deploy settings file.
opnfv-tht-pr: 104
opnfv-puppet-tripleo-pr: 12
os-net-config-pr: 3
Change-Id: Ie9d6151e6e58d11da3c66fbcabe4a0886c3fa152
Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'build/puppet-neutron-add-odl-settings.patch')
-rw-r--r-- | build/puppet-neutron-add-odl-settings.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/build/puppet-neutron-add-odl-settings.patch b/build/puppet-neutron-add-odl-settings.patch new file mode 100644 index 00000000..aa0b35a1 --- /dev/null +++ b/build/puppet-neutron-add-odl-settings.patch @@ -0,0 +1,47 @@ +diff --git a/manifests/plugins/ml2/opendaylight.pp b/manifests/plugins/ml2/opendaylight.pp +index a27c4d6..13b56c4 100644 +--- a/manifests/plugins/ml2/opendaylight.pp ++++ b/manifests/plugins/ml2/opendaylight.pp +@@ -29,12 +29,22 @@ + # (optional) The URI used to connect to the local OVSDB server + # Defaults to 'tcp:127.0.0.1:6639' + # ++# [*port_binding_controller*] ++# (optional) Name of the controller to be used for port binding. ++# Defaults to $::os_service_default ++# ++# [*odl_hostconf_uri*] ++# (optional) Path for ODL host configuration REST interface. ++# Defaults to $::os_service_default ++# + class neutron::plugins::ml2::opendaylight ( +- $package_ensure = 'present', +- $odl_username = $::os_service_default, +- $odl_password = $::os_service_default, +- $odl_url = $::os_service_default, +- $ovsdb_connection = 'tcp:127.0.0.1:6639', ++ $package_ensure = 'present', ++ $odl_username = $::os_service_default, ++ $odl_password = $::os_service_default, ++ $odl_url = $::os_service_default, ++ $ovsdb_connection = 'tcp:127.0.0.1:6639', ++ $port_binding_controller = $::os_service_default, ++ $odl_hostconf_uri = $::os_service_default, + ) { + + include ::neutron::deps +@@ -48,9 +58,11 @@ class neutron::plugins::ml2::opendaylight ( + ) + + neutron_plugin_ml2 { +- 'ml2_odl/username': value => $odl_username; +- 'ml2_odl/password': value => $odl_password; +- 'ml2_odl/url': value => $odl_url; ++ 'ml2_odl/username': value => $odl_username; ++ 'ml2_odl/password': value => $odl_password; ++ 'ml2_odl/url': value => $odl_url; ++ 'ml2_odl/port_binding_controller': value => $port_binding_controller; ++ 'ml2_odl/odl_hostconf_uri': value => $odl_hostconf_uri; + } + + neutron_config { |