openstack/puppet-neutron
Code Issues Proposed changes

Password should be secured

Browse Source 
Change-Id: I98fb0b7122cd624041aa35d5ad052b4debb68519
Closes-Bug: #1676708
This commit is contained in:
ZhongShengping 2017-03-28 18:02:55 +08:00
parent cf467641cb
commit 032e0114d9
22 changed files with 120 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/plugins/ml2/arista.pp
View File

@ -58,7 +58,7 @@ class neutron::plugins::ml2::arista(
neutron_plugin_ml2 { neutron_plugin_ml2 {
'ml2_arista/eapi_host' : value => $eapi_host; 'ml2_arista/eapi_host' : value => $eapi_host;
'ml2_arista/eapi_username': value => $eapi_username; 'ml2_arista/eapi_username': value => $eapi_username;
'ml2_arista/eapi_password': value => $eapi_password; 'ml2_arista/eapi_password': value => $eapi_password, secret => true;
'ml2_arista/region_name' : value => $region_name; 'ml2_arista/region_name' : value => $region_name;
'ml2_arista/sync_interval': value => $sync_interval; 'ml2_arista/sync_interval': value => $sync_interval;
'ml2_arista/use_fqdn' : value => $use_fqdn; 'ml2_arista/use_fqdn' : value => $use_fqdn;

2
manifests/plugins/ml2/arista/l3.pp
View File

@ -70,7 +70,7 @@ class neutron::plugins::ml2::arista::l3(
neutron_plugin_ml2 { neutron_plugin_ml2 {
'l3_arista/primary_l3_host' : value => $primary_l3_host; 'l3_arista/primary_l3_host' : value => $primary_l3_host;
'l3_arista/primary_l3_host_username': value => $primary_l3_host_username; 'l3_arista/primary_l3_host_username': value => $primary_l3_host_username;
'l3_arista/primary_l3_host_password': value => $primary_l3_host_password; 'l3_arista/primary_l3_host_password': value => $primary_l3_host_password, secret => true;
'l3_arista/secondary_l3_host' : value => $secondary_l3_host; 'l3_arista/secondary_l3_host' : value => $secondary_l3_host;
'l3_arista/mlag_config' : value => $mlag_config; 'l3_arista/mlag_config' : value => $mlag_config;
'l3_arista/l3_sync_interval' : value => $l3_sync_interval; 'l3_arista/l3_sync_interval' : value => $l3_sync_interval;

2
manifests/plugins/ml2/cisco/nexus1000v.pp
View File

@ -94,7 +94,7 @@ class neutron::plugins::ml2::cisco::nexus1000v (
neutron_plugin_ml2 { neutron_plugin_ml2 {
'ml2_cisco_n1kv/n1kv_vsm_ips' : value => $n1kv_vsm_ip; 'ml2_cisco_n1kv/n1kv_vsm_ips' : value => $n1kv_vsm_ip;
'ml2_cisco_n1kv/username' : value => $n1kv_vsm_username; 'ml2_cisco_n1kv/username' : value => $n1kv_vsm_username;
'ml2_cisco_n1kv/password' : value => $n1kv_vsm_password; 'ml2_cisco_n1kv/password' : value => $n1kv_vsm_password, secret => true;
'ml2_cisco_n1kv/default_policy_profile' : value => $default_policy_profile; 'ml2_cisco_n1kv/default_policy_profile' : value => $default_policy_profile;
'ml2_cisco_n1kv/default_vlan_network_profile' : value => $default_vlan_network_profile; 'ml2_cisco_n1kv/default_vlan_network_profile' : value => $default_vlan_network_profile;
'ml2_cisco_n1kv/default_vxlan_network_profile' : value => $default_vxlan_network_profile; 'ml2_cisco_n1kv/default_vxlan_network_profile' : value => $default_vxlan_network_profile;

2
manifests/plugins/ml2/cisco/nexus_switch.pp
View File

@ -94,7 +94,7 @@ define neutron::plugins::ml2::cisco::nexus_switch(
$section = "ML2_MECH_CISCO_NEXUS:${ip_address}" $section = "ML2_MECH_CISCO_NEXUS:${ip_address}"
neutron_plugin_ml2 { neutron_plugin_ml2 {
"${section}/username": value => $username; "${section}/username": value => $username;
"${section}/password": value => $password; "${section}/password": value => $password, secret => true;
"${section}/ssh_port": value => $ssh_port; "${section}/ssh_port": value => $ssh_port;
"${section}/nve_src_intf": value => $nve_src_intf; "${section}/nve_src_intf": value => $nve_src_intf;
"${section}/physnet": value => $physnet; "${section}/physnet": value => $physnet;

3
manifests/plugins/ml2/cisco/ucsm.pp
View File

@ -27,7 +27,6 @@
# Example: # Example:
# [ '2222:3333', '4444:5555' ] # [ '2222:3333', '4444:5555' ]
# #
class neutron::plugins::ml2::cisco::ucsm ( class neutron::plugins::ml2::cisco::ucsm (
$ucsm_ip, $ucsm_ip,
$ucsm_username, $ucsm_username,
@ -42,7 +41,7 @@ class neutron::plugins::ml2::cisco::ucsm (
neutron_plugin_ml2 { neutron_plugin_ml2 {
'ml2_cisco_ucsm/ucsm_ip' : value => $ucsm_ip; 'ml2_cisco_ucsm/ucsm_ip' : value => $ucsm_ip;
'ml2_cisco_ucsm/ucsm_username' : value => $ucsm_username; 'ml2_cisco_ucsm/ucsm_username' : value => $ucsm_username;
'ml2_cisco_ucsm/ucsm_password' : value => $ucsm_password; 'ml2_cisco_ucsm/ucsm_password' : value => $ucsm_password, secret => true;
'ml2_cisco_ucsm/ucsm_host_list' : value => $ucsm_host_list; 'ml2_cisco_ucsm/ucsm_host_list' : value => $ucsm_host_list;
'ml2_cisco_ucsm/supported_pci_devs' : value => $supported_pci_devs; 'ml2_cisco_ucsm/supported_pci_devs' : value => $supported_pci_devs;
} }

4
manifests/plugins/ml2/fujitsu/cfab.pp
View File

@ -35,7 +35,7 @@
# (optional) Whether to save configuration. # (optional) Whether to save configuration.
# Example: true # Example: true
# Defaults to true # Defaults to true
#
class neutron::plugins::ml2::fujitsu::cfab ( class neutron::plugins::ml2::fujitsu::cfab (
$address, $address,
$username, $username,
@ -51,7 +51,7 @@ class neutron::plugins::ml2::fujitsu::cfab (
neutron_plugin_ml2 { neutron_plugin_ml2 {
'fujitsu_cfab/address' : value => $address; 'fujitsu_cfab/address' : value => $address;
'fujitsu_cfab/username' : value => $username; 'fujitsu_cfab/username' : value => $username;
'fujitsu_cfab/password' : value => $password; 'fujitsu_cfab/password' : value => $password, secret => true;
'fujitsu_cfab/physical_networks' : value => join(any2array($physical_networks), ','); 'fujitsu_cfab/physical_networks' : value => join(any2array($physical_networks), ',');
'fujitsu_cfab/share_pprofile' : value => $share_pprofile; 'fujitsu_cfab/share_pprofile' : value => $share_pprofile;
'fujitsu_cfab/pprofile_prefix' : value => $pprofile_prefix; 'fujitsu_cfab/pprofile_prefix' : value => $pprofile_prefix;

4
manifests/plugins/ml2/fujitsu/fossw.pp
View File

@ -45,7 +45,7 @@
# (optional) The port number which OVSDB server on the fos switches listen. # (optional) The port number which OVSDB server on the fos switches listen.
# Example: 6640 # Example: 6640
# Defaults to 6640 # Defaults to 6640
#
class neutron::plugins::ml2::fujitsu::fossw ( class neutron::plugins::ml2::fujitsu::fossw (
$fossw_ips, $fossw_ips,
$username, $username,
@ -62,7 +62,7 @@ class neutron::plugins::ml2::fujitsu::fossw (
neutron_plugin_ml2 { neutron_plugin_ml2 {
'fujitsu_fossw/fossw_ips' : value => join(any2array($fossw_ips), ','); 'fujitsu_fossw/fossw_ips' : value => join(any2array($fossw_ips), ',');
'fujitsu_fossw/username' : value => $username; 'fujitsu_fossw/username' : value => $username;
'fujitsu_fossw/password' : value => $password; 'fujitsu_fossw/password' : value => $password, secret => true;
'fujitsu_fossw/port' : value => $port; 'fujitsu_fossw/port' : value => $port;
'fujitsu_fossw/timeout' : value => $timeout; 'fujitsu_fossw/timeout' : value => $timeout;
'fujitsu_fossw/udp_dest_port' : value => $udp_dest_port; 'fujitsu_fossw/udp_dest_port' : value => $udp_dest_port;

2
manifests/plugins/ml2/opendaylight.pp
View File

@ -59,7 +59,7 @@ class neutron::plugins::ml2::opendaylight (
neutron_plugin_ml2 { neutron_plugin_ml2 {
'ml2_odl/username': value => $odl_username; 'ml2_odl/username': value => $odl_username;
'ml2_odl/password': value => $odl_password; 'ml2_odl/password': value => $odl_password, secret => true;
'ml2_odl/url': value => $odl_url; 'ml2_odl/url': value => $odl_url;
'ml2_odl/port_binding_controller': value => $port_binding_controller; 'ml2_odl/port_binding_controller': value => $port_binding_controller;
'ml2_odl/odl_hostconf_uri': value => $odl_hostconf_uri; 'ml2_odl/odl_hostconf_uri': value => $odl_hostconf_uri;

2
manifests/plugins/ml2/vpp.pp
View File

@ -33,6 +33,6 @@ class neutron::plugins::ml2::vpp (
'ml2_vpp/etcd_host': value => $etcd_host; 'ml2_vpp/etcd_host': value => $etcd_host;
'ml2_vpp/etcd_port': value => $etcd_port; 'ml2_vpp/etcd_port': value => $etcd_port;
'ml2_vpp/etcd_user': value => $etcd_user; 'ml2_vpp/etcd_user': value => $etcd_user;
'ml2_vpp/etcd_pass': value => $etcd_pass; 'ml2_vpp/etcd_pass': value => $etcd_pass, secret => true;
} }
} }

4
manifests/plugins/plumgrid.pp
View File

@ -170,7 +170,7 @@ class neutron::plugins::plumgrid (
'database/connection': value => $connection; 'database/connection': value => $connection;
'l2gateway/vendor': value => $l2gateway_vendor; 'l2gateway/vendor': value => $l2gateway_vendor;
'l2gateway/sw_username': value => $l2gateway_sw_username; 'l2gateway/sw_username': value => $l2gateway_sw_username;
'l2gateway/sw_password': value => $l2gateway_sw_password; 'l2gateway/sw_password': value => $l2gateway_sw_password, secret =>true;
} }
neutron_plumlib_plumgrid { neutron_plumlib_plumgrid {
@ -185,7 +185,7 @@ class neutron::plugins::plumgrid (
'PLUMgridMetadata/nova_metadata_ip': value => $nova_metadata_ip; 'PLUMgridMetadata/nova_metadata_ip': value => $nova_metadata_ip;
'PLUMgridMetadata/nova_metadata_port': value => $nova_metadata_port; 'PLUMgridMetadata/nova_metadata_port': value => $nova_metadata_port;
'PLUMgridMetadata/nova_metadata_subnet': value => $nova_metadata_subnet; 'PLUMgridMetadata/nova_metadata_subnet': value => $nova_metadata_subnet;
'PLUMgridMetadata/metadata_proxy_shared_secret': value => $metadata_proxy_shared_secret; 'PLUMgridMetadata/metadata_proxy_shared_secret': value => $metadata_proxy_shared_secret, secret =>true;
'ConnectorType/connector_type': value => $connector_type; 'ConnectorType/connector_type': value => $connector_type;
} }
} }

2
spec/classes/neutron_plugins_ml2_arista_l3_spec.rb
View File

@ -55,7 +55,7 @@ describe 'neutron::plugins::ml2::arista::l3' do
it 'configures ml2 arista l3_arista settings' do it 'configures ml2 arista l3_arista settings' do
is_expected.to contain_neutron_plugin_ml2('l3_arista/primary_l3_host').with_value(params[:primary_l3_host]) is_expected.to contain_neutron_plugin_ml2('l3_arista/primary_l3_host').with_value(params[:primary_l3_host])
is_expected.to contain_neutron_plugin_ml2('l3_arista/primary_l3_host_username').with_value(params[:primary_l3_host_username]) is_expected.to contain_neutron_plugin_ml2('l3_arista/primary_l3_host_username').with_value(params[:primary_l3_host_username])
is_expected.to contain_neutron_plugin_ml2('l3_arista/primary_l3_host_password').with_value(params[:primary_l3_host_password]) is_expected.to contain_neutron_plugin_ml2('l3_arista/primary_l3_host_password').with_value(params[:primary_l3_host_password]).with_secret(true)
end end
end end

2
spec/classes/neutron_plugins_ml2_arista_spec.rb
View File

@ -54,7 +54,7 @@ describe 'neutron::plugins::ml2::arista' do
it 'configures ml2 arista settings' do it 'configures ml2 arista settings' do
is_expected.to contain_neutron_plugin_ml2('ml2_arista/eapi_host').with_value(params[:eapi_host]) is_expected.to contain_neutron_plugin_ml2('ml2_arista/eapi_host').with_value(params[:eapi_host])
is_expected.to contain_neutron_plugin_ml2('ml2_arista/eapi_username').with_value(params[:eapi_username]) is_expected.to contain_neutron_plugin_ml2('ml2_arista/eapi_username').with_value(params[:eapi_username])
is_expected.to contain_neutron_plugin_ml2('ml2_arista/eapi_password').with_value(params[:eapi_password]) is_expected.to contain_neutron_plugin_ml2('ml2_arista/eapi_password').with_value(params[:eapi_password]).with_secret(true)
end end
end end

2
spec/classes/neutron_plugins_ml2_cisco_nexus1000v_spec.rb
View File

@ -56,7 +56,7 @@ describe 'neutron::plugins::ml2::cisco::nexus1000v' do
it do it do
is_expected.to contain_neutron_plugin_ml2('ml2_cisco_n1kv/n1kv_vsm_ips').with_value(params[:n1kv_vsm_ip]) is_expected.to contain_neutron_plugin_ml2('ml2_cisco_n1kv/n1kv_vsm_ips').with_value(params[:n1kv_vsm_ip])
is_expected.to contain_neutron_plugin_ml2('ml2_cisco_n1kv/username').with_value(params[:n1kv_vsm_username]) is_expected.to contain_neutron_plugin_ml2('ml2_cisco_n1kv/username').with_value(params[:n1kv_vsm_username])
is_expected.to contain_neutron_plugin_ml2('ml2_cisco_n1kv/password').with_value(params[:n1kv_vsm_password]) is_expected.to contain_neutron_plugin_ml2('ml2_cisco_n1kv/password').with_value(params[:n1kv_vsm_password]).with_secret(true)
is_expected.to contain_neutron_plugin_ml2('ml2_cisco_n1kv/default_policy_profile').with_value(params[:default_policy_profile]) is_expected.to contain_neutron_plugin_ml2('ml2_cisco_n1kv/default_policy_profile').with_value(params[:default_policy_profile])
is_expected.to contain_neutron_plugin_ml2('ml2_cisco_n1kv/default_vlan_network_profile').with_value(params[:default_vlan_network_profile]) is_expected.to contain_neutron_plugin_ml2('ml2_cisco_n1kv/default_vlan_network_profile').with_value(params[:default_vlan_network_profile])
is_expected.to contain_neutron_plugin_ml2('ml2_cisco_n1kv/default_vxlan_network_profile').with_value(params[:default_vxlan_network_profile]) is_expected.to contain_neutron_plugin_ml2('ml2_cisco_n1kv/default_vxlan_network_profile').with_value(params[:default_vxlan_network_profile])

2
spec/classes/neutron_plugins_ml2_cisco_ucsm_spec.rb
View File

@ -48,7 +48,7 @@ describe 'neutron::plugins::ml2::cisco::ucsm' do
it do it do
is_expected.to contain_neutron_plugin_ml2('ml2_cisco_ucsm/ucsm_ip').with_value(params[:ucsm_ip]) is_expected.to contain_neutron_plugin_ml2('ml2_cisco_ucsm/ucsm_ip').with_value(params[:ucsm_ip])
is_expected.to contain_neutron_plugin_ml2('ml2_cisco_ucsm/ucsm_username').with_value(params[:ucsm_username]) is_expected.to contain_neutron_plugin_ml2('ml2_cisco_ucsm/ucsm_username').with_value(params[:ucsm_username])
is_expected.to contain_neutron_plugin_ml2('ml2_cisco_ucsm/ucsm_password').with_value(params[:ucsm_password]) is_expected.to contain_neutron_plugin_ml2('ml2_cisco_ucsm/ucsm_password').with_value(params[:ucsm_password]).with_secret(true)
is_expected.to contain_neutron_plugin_ml2('ml2_cisco_ucsm/ucsm_host_list').with_value(params[:ucsm_host_list]) is_expected.to contain_neutron_plugin_ml2('ml2_cisco_ucsm/ucsm_host_list').with_value(params[:ucsm_host_list])
is_expected.to contain_neutron_plugin_ml2('ml2_cisco_ucsm/supported_pci_devs').with_value(params[:supported_pci_devs]) is_expected.to contain_neutron_plugin_ml2('ml2_cisco_ucsm/supported_pci_devs').with_value(params[:supported_pci_devs])
end end

2
spec/classes/neutron_plugins_ml2_fujitsu_cfab_spec.rb
View File

@ -48,7 +48,7 @@ describe 'neutron::plugins::ml2::fujitsu::cfab' do
it do it do
is_expected.to contain_neutron_plugin_ml2('fujitsu_cfab/address').with_value(params[:address]) is_expected.to contain_neutron_plugin_ml2('fujitsu_cfab/address').with_value(params[:address])
is_expected.to contain_neutron_plugin_ml2('fujitsu_cfab/username').with_value(params[:username]) is_expected.to contain_neutron_plugin_ml2('fujitsu_cfab/username').with_value(params[:username])
is_expected.to contain_neutron_plugin_ml2('fujitsu_cfab/password').with_value(params[:password]) is_expected.to contain_neutron_plugin_ml2('fujitsu_cfab/password').with_value(params[:password]).with_secret(true)
is_expected.to contain_neutron_plugin_ml2('fujitsu_cfab/physical_networks').with_value(params[:physical_networks]) is_expected.to contain_neutron_plugin_ml2('fujitsu_cfab/physical_networks').with_value(params[:physical_networks])
is_expected.to contain_neutron_plugin_ml2('fujitsu_cfab/share_pprofile').with_value(params[:share_pprofile]) is_expected.to contain_neutron_plugin_ml2('fujitsu_cfab/share_pprofile').with_value(params[:share_pprofile])
is_expected.to contain_neutron_plugin_ml2('fujitsu_cfab/pprofile_prefix').with_value(params[:pprofile_prefix]) is_expected.to contain_neutron_plugin_ml2('fujitsu_cfab/pprofile_prefix').with_value(params[:pprofile_prefix])

2
spec/classes/neutron_plugins_ml2_fujitsu_fossw_spec.rb
View File

@ -49,7 +49,7 @@ describe 'neutron::plugins::ml2::fujitsu::fossw' do
it do it do
is_expected.to contain_neutron_plugin_ml2('fujitsu_fossw/fossw_ips').with_value(params[:fossw_ips]) is_expected.to contain_neutron_plugin_ml2('fujitsu_fossw/fossw_ips').with_value(params[:fossw_ips])
is_expected.to contain_neutron_plugin_ml2('fujitsu_fossw/username').with_value(params[:username]) is_expected.to contain_neutron_plugin_ml2('fujitsu_fossw/username').with_value(params[:username])
is_expected.to contain_neutron_plugin_ml2('fujitsu_fossw/password').with_value(params[:password]) is_expected.to contain_neutron_plugin_ml2('fujitsu_fossw/password').with_value(params[:password]).with_secret(true)
is_expected.to contain_neutron_plugin_ml2('fujitsu_fossw/port').with_value(params[:port]) is_expected.to contain_neutron_plugin_ml2('fujitsu_fossw/port').with_value(params[:port])
is_expected.to contain_neutron_plugin_ml2('fujitsu_fossw/timeout').with_value(params[:timeout]) is_expected.to contain_neutron_plugin_ml2('fujitsu_fossw/timeout').with_value(params[:timeout])
is_expected.to contain_neutron_plugin_ml2('fujitsu_fossw/udp_dest_port').with_value(params[:udp_dest_port]) is_expected.to contain_neutron_plugin_ml2('fujitsu_fossw/udp_dest_port').with_value(params[:udp_dest_port])

2
spec/classes/neutron_plugins_ml2_opendaylight_spec.rb
View File

@ -50,7 +50,7 @@ describe 'neutron::plugins::ml2::opendaylight' do
end end
it 'configures ml2_odl settings' do it 'configures ml2_odl settings' do
is_expected.to contain_neutron_plugin_ml2('ml2_odl/password').with_value(params[:odl_password]) is_expected.to contain_neutron_plugin_ml2('ml2_odl/password').with_value(params[:odl_password]).with_secret(true)
is_expected.to contain_neutron_plugin_ml2('ml2_odl/username').with_value(params[:odl_username]) is_expected.to contain_neutron_plugin_ml2('ml2_odl/username').with_value(params[:odl_username])
is_expected.to contain_neutron_plugin_ml2('ml2_odl/url').with_value(params[:odl_url]) is_expected.to contain_neutron_plugin_ml2('ml2_odl/url').with_value(params[:odl_url])
is_expected.to contain_neutron_plugin_ml2('ml2_odl/port_binding_controller').with_value(params[:port_binding_controller]) is_expected.to contain_neutron_plugin_ml2('ml2_odl/port_binding_controller').with_value(params[:port_binding_controller])

4
spec/classes/neutron_plugins_ml2_vpp_spec.rb
View File

@ -41,7 +41,7 @@ describe 'neutron::plugins::ml2::vpp' do
is_expected.to contain_neutron_plugin_ml2('ml2_vpp/etcd_host').with_value(params[:etcd_host]) is_expected.to contain_neutron_plugin_ml2('ml2_vpp/etcd_host').with_value(params[:etcd_host])
is_expected.to contain_neutron_plugin_ml2('ml2_vpp/etcd_port').with_value(params[:etcd_port]) is_expected.to contain_neutron_plugin_ml2('ml2_vpp/etcd_port').with_value(params[:etcd_port])
is_expected.to contain_neutron_plugin_ml2('ml2_vpp/etcd_user').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_plugin_ml2('ml2_vpp/etcd_user').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_plugin_ml2('ml2_vpp/etcd_pass').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_plugin_ml2('ml2_vpp/etcd_pass').with_value('<SERVICE DEFAULT>').with_secret(true)
end end
context 'when enabling etcd authentication' do context 'when enabling etcd authentication' do
@ -51,7 +51,7 @@ describe 'neutron::plugins::ml2::vpp' do
end end
it 'should configure etcd username and password' do it 'should configure etcd username and password' do
is_expected.to contain_neutron_plugin_ml2('ml2_vpp/etcd_user').with_value('admin') is_expected.to contain_neutron_plugin_ml2('ml2_vpp/etcd_user').with_value('admin')
is_expected.to contain_neutron_plugin_ml2('ml2_vpp/etcd_pass').with_value('password') is_expected.to contain_neutron_plugin_ml2('ml2_vpp/etcd_pass').with_value('password').with_secret(true)
end end
end end
end end

2
spec/classes/neutron_plugins_opencontrail_spec.rb
View File

@ -54,7 +54,7 @@ describe 'neutron::plugins::opencontrail' do
is_expected.to contain_neutron_plugin_opencontrail('KEYSTONE/auth_url').with_value(params[:keystone_auth_url]) is_expected.to contain_neutron_plugin_opencontrail('KEYSTONE/auth_url').with_value(params[:keystone_auth_url])
is_expected.to contain_neutron_plugin_opencontrail('KEYSTONE/admin_user').with_value(params[:keystone_admin_user]) is_expected.to contain_neutron_plugin_opencontrail('KEYSTONE/admin_user').with_value(params[:keystone_admin_user])
is_expected.to contain_neutron_plugin_opencontrail('KEYSTONE/admin_tenant_name').with_value(params[:keystone_admin_tenant_name]) is_expected.to contain_neutron_plugin_opencontrail('KEYSTONE/admin_tenant_name').with_value(params[:keystone_admin_tenant_name])
is_expected.to contain_neutron_plugin_opencontrail('KEYSTONE/admin_password').with_value(params[:keystone_admin_password]) is_expected.to contain_neutron_plugin_opencontrail('KEYSTONE/admin_password').with_value(params[:keystone_admin_password]).with_secret(true)
is_expected.to contain_neutron_plugin_opencontrail('KEYSTONE/admin_token').with_value(params[:keystone_admin_token]) is_expected.to contain_neutron_plugin_opencontrail('KEYSTONE/admin_token').with_value(params[:keystone_admin_token])
end end

6
spec/classes/neutron_plugins_plumgrid_spec.rb
View File

@ -72,12 +72,12 @@ describe 'neutron::plugins::plumgrid' do
is_expected.to contain_neutron_plugin_plumgrid('PLUMgridDirector/director_server').with_value(params[:director_server]) is_expected.to contain_neutron_plugin_plumgrid('PLUMgridDirector/director_server').with_value(params[:director_server])
is_expected.to contain_neutron_plugin_plumgrid('PLUMgridDirector/director_server_port').with_value(params[:director_server_port]) is_expected.to contain_neutron_plugin_plumgrid('PLUMgridDirector/director_server_port').with_value(params[:director_server_port])
is_expected.to contain_neutron_plugin_plumgrid('PLUMgridDirector/username').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_plugin_plumgrid('PLUMgridDirector/username').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_plugin_plumgrid('PLUMgridDirector/password').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_plugin_plumgrid('PLUMgridDirector/password').with_value('<SERVICE DEFAULT>').with_secret(true)
is_expected.to contain_neutron_plugin_plumgrid('PLUMgridDirector/servertimeout').with_value(params[:servertimeout]) is_expected.to contain_neutron_plugin_plumgrid('PLUMgridDirector/servertimeout').with_value(params[:servertimeout])
is_expected.to contain_neutron_plugin_plumgrid('database/connection').with_value(params[:connection]) is_expected.to contain_neutron_plugin_plumgrid('database/connection').with_value(params[:connection])
is_expected.to contain_neutron_plugin_plumgrid('l2gateway/vendor').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_plugin_plumgrid('l2gateway/vendor').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_plugin_plumgrid('l2gateway/sw_username').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_plugin_plumgrid('l2gateway/sw_username').with_value('<SERVICE DEFAULT>')
is_expected.to contain_neutron_plugin_plumgrid('l2gateway/sw_password').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_plugin_plumgrid('l2gateway/sw_password').with_value('<SERVICE DEFAULT>').with_secret(true)
end end
it 'should perform default configuration of plumgrid plumlib' do it 'should perform default configuration of plumgrid plumlib' do
@ -90,7 +90,7 @@ describe 'neutron::plugins::plumgrid' do
is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/nova_metadata_ip').with_value(params[:nova_metadata_ip]) is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/nova_metadata_ip').with_value(params[:nova_metadata_ip])
is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/nova_metadata_port').with_value(params[:nova_metadata_port]) is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/nova_metadata_port').with_value(params[:nova_metadata_port])
is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/nova_metadata_subnet').with_value(params[:nova_metadata_subnet]) is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/nova_metadata_subnet').with_value(params[:nova_metadata_subnet])
is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/metadata_proxy_shared_secret').with_value('<SERVICE DEFAULT>') is_expected.to contain_neutron_plumlib_plumgrid('PLUMgridMetadata/metadata_proxy_shared_secret').with_value('<SERVICE DEFAULT>').with_secret(true)
is_expected.to contain_neutron_plumlib_plumgrid('ConnectorType/connector_type').with_value('distributed') is_expected.to contain_neutron_plumlib_plumgrid('ConnectorType/connector_type').with_value('distributed')
end end