From: Itzik Brown <itzikb@redhat.com>
Date: Thu, 6 Jul 2017 10:42:12 +0000 (+0300)
Subject: Fixing a bug when setting a password for ODL controller
X-Git-Tag: opnfv-6.0.0~383^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0477e1566f22979d71fd41851fd4ab5014097471;p=apex-tripleo-heat-templates.git

Fixing a bug when setting a password for ODL controller

Change-Id: I301f73801e95e607ed28992e68528f17843a0b6c
Closes-Bug: #1702435
---

diff --git a/puppet/services/opendaylight-ovs.yaml b/puppet/services/opendaylight-ovs.yaml
index 1a8754a5..d8a6f9bd 100644
--- a/puppet/services/opendaylight-ovs.yaml
+++ b/puppet/services/opendaylight-ovs.yaml
@@ -76,6 +76,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