openstack/puppet-manila
Code Issues Proposed changes

Password should be secured

Browse Source 
Change-Id: Iee879506b769294639b80a1ba64e93ae3a37ae0a
Closes-Bug: #1676708
This commit is contained in:
ZhongShengping 2017-03-28 17:36:43 +08:00
parent 69e1fc4705
commit 8529eaa97d
7 changed files with 52 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/backend/netapp.pp
View File

@ -98,7 +98,7 @@
# netapp_storage_family => 'ontap_cluster', # netapp_storage_family => 'ontap_cluster',
# netapp_transport_type => 'https', # netapp_transport_type => 'https',
# } # }
#
define manila::backend::netapp ( define manila::backend::netapp (
$driver_handles_share_servers, $driver_handles_share_servers,
$netapp_login, $netapp_login,

4
manifests/compute/nova.pp
View File

@ -53,10 +53,10 @@ class manila::compute::nova (
manila_config { manila_config {
'DEFAULT/nova_catalog_info': value => $nova_catalog_info; 'DEFAULT/nova_catalog_info': value => $nova_catalog_info;
'DEFAULT/nova_catalog_admin_info': value => $nova_catalog_admin_info; 'DEFAULT/nova_catalog_admin_info': value => $nova_catalog_admin_info;
'DEFAULT/nova_ca_certificates_file':value => $nova_ca_certificates_file; 'DEFAULT/nova_ca_certificates_file': value => $nova_ca_certificates_file;
'DEFAULT/nova_api_insecure': value => $nova_api_insecure; 'DEFAULT/nova_api_insecure': value => $nova_api_insecure;
'DEFAULT/nova_admin_username': value => $nova_admin_username; 'DEFAULT/nova_admin_username': value => $nova_admin_username;
'DEFAULT/nova_admin_password': value => $nova_admin_password; 'DEFAULT/nova_admin_password': value => $nova_admin_password, secret => true;
'DEFAULT/nova_admin_tenant_name': value => $nova_admin_tenant_name; 'DEFAULT/nova_admin_tenant_name': value => $nova_admin_tenant_name;
'DEFAULT/nova_admin_auth_url': value => $nova_admin_auth_url; 'DEFAULT/nova_admin_auth_url': value => $nova_admin_auth_url;
} }

3
manifests/network/neutron.pp
View File

@ -36,7 +36,6 @@
# (optional) Location of ca certificates file to use for # (optional) Location of ca certificates file to use for
# neutron client requests. # neutron client requests.
# #
class manila::network::neutron ( class manila::network::neutron (
$neutron_url = 'http://127.0.0.1:9696', $neutron_url = 'http://127.0.0.1:9696',
$neutron_url_timeout = 30, $neutron_url_timeout = 30,
@ -57,7 +56,7 @@ class manila::network::neutron (
'DEFAULT/neutron_url': value => $neutron_url; 'DEFAULT/neutron_url': value => $neutron_url;
'DEFAULT/neutron_url_timeout': value => $neutron_url_timeout; 'DEFAULT/neutron_url_timeout': value => $neutron_url_timeout;
'DEFAULT/neutron_admin_username': value => $neutron_admin_username; 'DEFAULT/neutron_admin_username': value => $neutron_admin_username;
'DEFAULT/neutron_admin_password': value => $neutron_admin_password; 'DEFAULT/neutron_admin_password': value => $neutron_admin_password, secret => true;
'DEFAULT/neutron_admin_tenant_name': value => $neutron_admin_tenant_name; 'DEFAULT/neutron_admin_tenant_name': value => $neutron_admin_tenant_name;
'DEFAULT/neutron_region_name': value => $neutron_region_name; 'DEFAULT/neutron_region_name': value => $neutron_region_name;
'DEFAULT/neutron_admin_auth_url': value => $neutron_admin_auth_url; 'DEFAULT/neutron_admin_auth_url': value => $neutron_admin_auth_url;

1
manifests/share/hitachi_hnas.pp
View File

@ -44,7 +44,6 @@
# hitachi_hnas_file_system_name => 'FS-Manila', # hitachi_hnas_file_system_name => 'FS-Manila',
# } # }
# #
class manila::share::hitachi_hnas ( class manila::share::hitachi_hnas (
$hitachi_hnas_username, $hitachi_hnas_username,
$hitachi_hnas_password, $hitachi_hnas_password,

1
manifests/share/netapp.pp
View File

@ -89,7 +89,6 @@
# netapp_transport_type => 'https', # netapp_transport_type => 'https',
# } # }
# #
class manila::share::netapp ( class manila::share::netapp (
$driver_handles_share_servers, $driver_handles_share_servers,
$netapp_login, $netapp_login,

2
manifests/volume/cinder.pp
View File

@ -63,7 +63,7 @@ manila_config {
'DEFAULT/cinder_api_insecure': value => $cinder_api_insecure; 'DEFAULT/cinder_api_insecure': value => $cinder_api_insecure;
'DEFAULT/cinder_cross_az_attach': value => $cinder_cross_az_attach; 'DEFAULT/cinder_cross_az_attach': value => $cinder_cross_az_attach;
'DEFAULT/cinder_admin_username': value => $cinder_admin_username; 'DEFAULT/cinder_admin_username': value => $cinder_admin_username;
'DEFAULT/cinder_admin_password': value => $cinder_admin_password; 'DEFAULT/cinder_admin_password': value => $cinder_admin_password, secret => true;
'DEFAULT/cinder_admin_tenant_name': value => $cinder_admin_tenant_name; 'DEFAULT/cinder_admin_tenant_name': value => $cinder_admin_tenant_name;
'DEFAULT/cinder_admin_auth_url': value => $cinder_admin_auth_url; 'DEFAULT/cinder_admin_auth_url': value => $cinder_admin_auth_url;
} }