From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 19 Jul 2017 21:24:49 +0000 (+0000)
Subject: Merge "Fixing a bug when setting a password for ODL controller"
X-Git-Tag: opnfv-6.0.0~383
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=271f3b52a8056b4e29291e11818c3558962098d8;hp=80da11d686354fb8dc56aaa3ad66d0ea22373214;p=apex-tripleo-heat-templates.git

Merge "Fixing a bug when setting a password for ODL controller"
---

diff --git a/puppet/services/opendaylight-ovs.yaml b/puppet/services/opendaylight-ovs.yaml
index 8ffa8a34..2027292c 100644
--- a/puppet/services/opendaylight-ovs.yaml
+++ b/puppet/services/opendaylight-ovs.yaml
@@ -81,6 +81,8 @@ outputs:
           - opendaylight::odl_rest_port: {get_param: OpenDaylightPort}
             opendaylight::username: {get_param: OpenDaylightUsername}
             opendaylight::password: {get_param: OpenDaylightPassword}
+            neutron::plugins::ovs::opendaylight::odl_username: {get_param: OpenDaylightUsername}
+            neutron::plugins::ovs::opendaylight::odl_password: {get_param: OpenDaylightPassword}
             opendaylight_check_url: {get_param: OpenDaylightCheckURL}
             opendaylight::nb_connection_protocol: {get_param: OpenDaylightConnectionProtocol}
             neutron::agents::ml2::ovs::local_ip: {get_param: [ServiceNetMap, NeutronTenantNetwork]}
diff --git a/releasenotes/notes/odl-user-a4c58ac0c3a64d90.yaml b/releasenotes/notes/odl-user-a4c58ac0c3a64d90.yaml
new file mode 100644
index 00000000..d37ab12b
--- /dev/null
+++ b/releasenotes/notes/odl-user-a4c58ac0c3a64d90.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - Fixing an issue where a custom password for the
+    OpenDaylight controller caused the TripleO deployment
+    to fail