diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-10-14 17:43:51 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-10-18 17:11:46 -0400 |
| commit | a970cf81d8b06c6999966b20ad2b4c980b3b107b (patch) | |
| tree | ef884d6f57ba370f27dce95b20c01a5b1773368b /manifests/profile/base/neutron/plugins/ml2 | |
| parent | 33be802c705c857ce94a80252bc22b2e01e27fa8 (diff) | |
Fixes missing ODL ML2 Authentication info
Without this, neutron-server fails to start and communication will not
work to ODL REST.
Parital-Bug: 1633630
Change-Id: Ifd906db4e6062ac271c2147fe1149b1009d06ae2
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'manifests/profile/base/neutron/plugins/ml2')
| -rw-r--r-- | manifests/profile/base/neutron/plugins/ml2/opendaylight.pp | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp b/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp index f25aea6..43ff87e 100644 --- a/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp +++ b/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp @@ -22,6 +22,14 @@ # (Optional) Port to use for OpenDaylight # Defaults to hiera('opendaylight::odl_rest_port') # +# [*odl_username*] +# (Optional) Username to configure for OpenDaylight +# Defaults to 'admin' +# +# [*odl_password*] +# (Optional) Password to configure for OpenDaylight +# Defaults to 'admin' +# # [*conn_proto*] # (Optional) Protocol to use to for ODL REST access # Defaults to hiera('opendaylight::nb_connection_protocol') @@ -32,9 +40,11 @@ # Defaults to hiera('step') # class tripleo::profile::base::neutron::plugins::ml2::opendaylight ( - $odl_port = hiera('opendaylight::odl_rest_port'), - $conn_proto = hiera('opendaylight::nb_connection_protocol'), - $step = hiera('step'), + $odl_port = hiera('opendaylight::odl_rest_port'), + $odl_username = hiera('opendaylight::username'), + $odl_password = hiera('opendaylight::password'), + $conn_proto = hiera('opendaylight::nb_connection_protocol'), + $step = hiera('step'), ) { if $step >= 4 { @@ -48,7 +58,9 @@ class tripleo::profile::base::neutron::plugins::ml2::opendaylight ( if ! $odl_url_ip { fail('OpenDaylight Controller IP/VIP is Empty') } class { '::neutron::plugins::ml2::opendaylight': - odl_url => "${conn_proto}://${odl_url_ip}:${odl_port}/controller/nb/v2/neutron"; + odl_username => $odl_username, + odl_password => $odl_password, + odl_url => "${conn_proto}://${odl_url_ip}:${odl_port}/controller/nb/v2/neutron"; } } } |