3 files changed, 20 insertions, 19 deletions
diff --git a/manifests/profile/base/neutron/opendaylight.pp b/manifests/profile/base/neutron/opendaylight.pp
index ffe28ce..a3f46ec 100644
--- a/manifests/profile/base/neutron/opendaylight.pp
+++ b/manifests/profile/base/neutron/opendaylight.pp
@@ -39,7 +39,7 @@ class tripleo::profile::base::neutron::opendaylight (
 
   if $step >= 1 {
     # Configure ODL only on first controller
-    if hiera('odl_on_controller') and $primary_controller == downcase($::hostname) {
+    if $primary_controller == downcase($::hostname) {
       include ::opendaylight
     }
   }
diff --git a/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp b/manifests/profile/base/neutron/plugins/ml2/opendaylight.pp
index f25aea6..2eb09ae 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,23 +40,22 @@
 #   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 {
-    # Figure out ODL IP
-    if hiera('odl_on_controller') {
-      $odl_url_ip = hiera('opendaylight_api_vip')
-    } else {
-      $odl_url_ip = hiera('opendaylight::odl_bind_ip')
-    }
+    $odl_url_ip = hiera('opendaylight_api_vip')
 
     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";
     }
   }
 }
diff --git a/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp b/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp
index 7548046..91c5168 100644
--- a/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp
+++ b/manifests/profile/base/neutron/plugins/ovs/opendaylight.pp
@@ -48,14 +48,8 @@ class tripleo::profile::base::neutron::plugins::ovs::opendaylight (
 ) {
 
   if $step >= 4 {
-    # Figure out ODL IP (and VIP if on controller)
-    if hiera('odl_on_controller') {
-      $opendaylight_controller_ip = $odl_api_ips[0]
-      $odl_url_ip = hiera('opendaylight_api_vip')
-    } else {
-      $opendaylight_controller_ip = hiera('opendaylight::odl_bind_ip')
-      $odl_url_ip = $opendaylight_controller_ip
-    }
+    $opendaylight_controller_ip = $odl_api_ips[0]
+    $odl_url_ip = hiera('opendaylight_api_vip')
 
     if ! $opendaylight_controller_ip { fail('OpenDaylight Controller IP is Empty') }