build/puppet-neutron-add-odl-settings.patch

   1 diff --git a/manifests/plugins/ml2/opendaylight.pp b/manifests/plugins/ml2/opendaylight.pp
   2 index a27c4d6..13b56c4 100644
   3 --- a/manifests/plugins/ml2/opendaylight.pp
   4 +++ b/manifests/plugins/ml2/opendaylight.pp
   5 @@ -29,12 +29,22 @@
   6  # (optional) The URI used to connect to the local OVSDB server
   7  # Defaults to 'tcp:127.0.0.1:6639'
   8  #
   9 +# [*port_binding_controller*]
  10 +# (optional) Name of the controller to be used for port binding.
  11 +# Defaults to $::os_service_default
  12 +#
  13 +# [*odl_hostconf_uri*]
  14 +# (optional) Path for ODL host configuration REST interface.
  15 +# Defaults to $::os_service_default
  16 +#
  17  class neutron::plugins::ml2::opendaylight (
  18 -  $package_ensure     = 'present',
  19 -  $odl_username       = $::os_service_default,
  20 -  $odl_password       = $::os_service_default,
  21 -  $odl_url            = $::os_service_default,
  22 -  $ovsdb_connection   = 'tcp:127.0.0.1:6639',
  23 +  $package_ensure          = 'present',
  24 +  $odl_username            = $::os_service_default,
  25 +  $odl_password            = $::os_service_default,
  26 +  $odl_url                 = $::os_service_default,
  27 +  $ovsdb_connection        = 'tcp:127.0.0.1:6639',
  28 +  $port_binding_controller = $::os_service_default,
  29 +  $odl_hostconf_uri        = $::os_service_default,
  30  ) {
  31
  32    include ::neutron::deps
  33 @@ -48,9 +58,11 @@ class neutron::plugins::ml2::opendaylight (
  34    )
  35
  36    neutron_plugin_ml2 {
  37 -    'ml2_odl/username': value => $odl_username;
  38 -    'ml2_odl/password': value => $odl_password;
  39 -    'ml2_odl/url':      value => $odl_url;
  40 +    'ml2_odl/username':                value => $odl_username;
  41 +    'ml2_odl/password':                value => $odl_password;
  42 +    'ml2_odl/url':                     value => $odl_url;
  43 +    'ml2_odl/port_binding_controller': value => $port_binding_controller;
  44 +    'ml2_odl/odl_hostconf_uri':        value => $odl_hostconf_uri;
  45    }
  46
  47    neutron_config {