Merge "Removing the default values for OpenDaylight values"

manifests/plugins/ovs/opendaylight.pp

@@ -9,11 +9,9 @@
 #
 # [*odl_username*]
 # (optional) The opendaylight controller username
-# Defaults to 'admin'
 #
 # [*odl_password*]
 # (optional) The opendaylight controller password
-# Defaults to 'admin'
 #
 # [*odl_check_url*]
 # (optional) The URL used to check ODL is available and ready
@@ -43,8 +41,8 @@
 #
 class neutron::plugins::ovs::opendaylight (
   $tunnel_ip,
-  $odl_username       = 'admin',
-  $odl_password       = 'admin',
+  $odl_username,
+  $odl_password,
   $odl_check_url      = 'http://127.0.0.1:8080/restconf/operational/network-topology:network-topology/topology/netvirt:1',
   $odl_ovsdb_iface    = 'tcp:127.0.0.1:6640',
   $ovsdb_server_iface = 'ptcp:6639:127.0.0.1',

releasenotes/notes/odl-user-8a1aa565c01ea3ef.yaml

@@ -0,0 +1,4 @@
+---
+fixes:
+  - Removing the default value for odl_username
+    and odl_password

spec/classes/neutron_plugins_ml2_opendaylight_spec.rb

@@ -15,8 +15,6 @@ describe 'neutron::plugins::ml2::opendaylight' do
   let :default_params do
     {
       :package_ensure          => 'present',
-      :odl_username            => '<SERVICE DEFAULT>',
-      :odl_password            => '<SERVICE DEFAULT>',
       :odl_url                 => '<SERVICE DEFAULT>',
       :ovsdb_connection        => 'tcp:127.0.0.1:6639',
       :port_binding_controller => '<SERVICE DEFAULT>',
@@ -26,6 +24,8 @@ describe 'neutron::plugins::ml2::opendaylight' do
 
   let :params do
     {
+      :odl_username           => 'user',
+      :odl_password           => 'password',
     }
   end
 

spec/classes/neutron_plugins_ovs_opendaylight_spec.rb

@@ -14,8 +14,6 @@ describe 'neutron::plugins::ovs::opendaylight' do
 
   let :default_params do
     {
-      :odl_username       => 'admin',
-      :odl_password       => 'admin',
       :odl_check_url      => 'http://127.0.0.1:8080/restconf/operational/network-topology:network-topology/topology/netvirt:1',
       :odl_ovsdb_iface    => 'tcp:127.0.0.1:6640',
       :ovsdb_server_iface => 'ptcp:6639:127.0.0.1',
@@ -28,6 +26,8 @@ describe 'neutron::plugins::ovs::opendaylight' do
   let :params do
     {
       :tunnel_ip         => '127.0.0.1',
+      :odl_username       => 'user',
+      :odl_password       => 'password',
     }
   end