Mark password config options with secret

Config object supports masking values when writing out if the secret
flag is set on the option definition.  This change flags all cinder
options containing a password.

Change-Id: Ia0b203417774797c1fe1eaf2946453c9b2509b98

diff --git a/cinder/volume/drivers/netapp.py b/cinder/volume/drivers/netapp.py
index d3d1316a3844bd8ed9821cff27bc104a8e7bc688..9f4d85eec006d096f1d6cb9cb6ca2aa7917482eb 100644 (file)
--- a/cinder/volume/drivers/netapp.py
+++ b/cinder/volume/drivers/netapp.py
@@ -47,7 +47,8 @@ netapp_opts = [
                help='User name for the DFM server'),
     cfg.StrOpt('netapp_password',
                default=None,
-               help='Password for the DFM server'),
+               help='Password for the DFM server',
+               secret=True),
     cfg.StrOpt('netapp_server_hostname',
                default=None,
                help='Hostname for the DFM server'),

diff --git a/cinder/volume/drivers/nexenta/volume.py b/cinder/volume/drivers/nexenta/volume.py
index 5af2084e95d66e4169f39a0283a18c9e9d89e158..163a975096546497c342b9ce690974692f67a082 100644 (file)
--- a/cinder/volume/drivers/nexenta/volume.py
+++ b/cinder/volume/drivers/nexenta/volume.py
@@ -48,7 +48,8 @@ nexenta_opts = [
                help='User name to connect to Nexenta SA'),
     cfg.StrOpt('nexenta_password',
                default='nexenta',
-               help='Password to connect to Nexenta SA'),
+               help='Password to connect to Nexenta SA',
+               secret=True),
     cfg.IntOpt('nexenta_iscsi_target_portal_port',
                default=3260,
                help='Nexenta target portal port'),

diff --git a/cinder/volume/drivers/san/hp/hp_3par_common.py b/cinder/volume/drivers/san/hp/hp_3par_common.py
index 177037f5e75db08c56c90c60902ec874983b1b14..418a9aba2ce528ae5749fd1fa0a78745eb0cd40f 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_3par_common.py
+++ b/cinder/volume/drivers/san/hp/hp_3par_common.py
@@ -63,7 +63,8 @@ hp3par_opts = [
                help="3PAR Super user username"),
     cfg.StrOpt('hp3par_password',
                default='',
-               help="3PAR Super user password"),
+               help="3PAR Super user password",
+               secret=True),
     cfg.StrOpt('hp3par_domain',
                default="OpenStack",
                help="The 3par domain name to use"),

diff --git a/cinder/volume/drivers/san/san.py b/cinder/volume/drivers/san/san.py
index b6b442c1661eb3226dbdbfffc6857f1da73c00a4..9315b16419dd1ece2082d999fdcd4ac6d9ffe75c 100644 (file)
--- a/cinder/volume/drivers/san/san.py
+++ b/cinder/volume/drivers/san/san.py
@@ -48,7 +48,8 @@ san_opts = [
                help='Username for SAN controller'),
     cfg.StrOpt('san_password',
                default='',
-               help='Password for SAN controller'),
+               help='Password for SAN controller',
+               secret=True),
     cfg.StrOpt('san_private_key',
                default='',
                help='Filename of private key to use for SSH authentication'),

diff --git a/cinder/volume/drivers/xenapi/sm.py b/cinder/volume/drivers/xenapi/sm.py
index 337a3d8519780d4229e1cec6cfff1228c993d32d..a0bf1164d2fc7ff52177a87242b21cf6fa31f575 100644 (file)
--- a/cinder/volume/drivers/xenapi/sm.py
+++ b/cinder/volume/drivers/xenapi/sm.py
@@ -31,7 +31,8 @@ xenapi_opts = [
                help='Username for XenAPI connection'),
     cfg.StrOpt('xenapi_connection_password',
                default=None,
-               help='Password for XenAPI connection'),
+               help='Password for XenAPI connection',
+               secret=True),
 ]
 
 xenapi_nfs_opts = [

diff --git a/cinder/volume/drivers/zadara.py b/cinder/volume/drivers/zadara.py
index 6af373c154c0161a27da1c232d043a2303ea66f5..62029876750b41a2ab6bb06746d027b86b4d67f6 100644 (file)
--- a/cinder/volume/drivers/zadara.py
+++ b/cinder/volume/drivers/zadara.py
@@ -51,7 +51,8 @@ zadara_opts = [
                help='User name for the VPSA'),
     cfg.StrOpt('zadara_password',
                default=None,
-               help='Password for the VPSA'),
+               help='Password for the VPSA',
+               secret=True),
 
     cfg.StrOpt('zadara_vpsa_poolname',
                default=None,