openstack/puppet-neutron
Code Issues Proposed changes

Removing the default values for OpenDaylight values

Browse Source 
Removing default values for odl_username and odl_password

Change-Id: I63d28a21ff34c34dd2812be1d94904dad4566964
This commit is contained in:
Itzik Brown 2017-07-05 12:11:26 +03:00
parent 62f49da2eb
commit 814b9bd492
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/plugins/ovs/opendaylight.pp
View File

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

4
releasenotes/notes/odl-user-8a1aa565c01ea3ef.yaml Normal file
View File

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

4
spec/classes/neutron_plugins_ml2_opendaylight_spec.rb
View File

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

4
spec/classes/neutron_plugins_ovs_opendaylight_spec.rb
View File

@ -14,8 +14,6 @@ describe 'neutron::plugins::ovs::opendaylight' do
let :default_params 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_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', :odl_ovsdb_iface => 'tcp:127.0.0.1:6640',
:ovsdb_server_iface => 'ptcp:6639:127.0.0.1', :ovsdb_server_iface => 'ptcp:6639:127.0.0.1',
@ -28,6 +26,8 @@ describe 'neutron::plugins::ovs::opendaylight' do
let :params do let :params do
{ {
:tunnel_ip => '127.0.0.1', :tunnel_ip => '127.0.0.1',
:odl_username => 'user',
:odl_password => 'password',
} }
end end