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 quantum
options containing a password.

Change-Id: I68d9bf80c673acc72db22dc2c6907ee180dcc605

diff --git a/quantum/agent/dhcp_agent.py b/quantum/agent/dhcp_agent.py
index 5631f4235f92005444bd2a1f4c8513b5d575f120..0167e55e7e1649ddd8a68268c8ab7eb02aaaba28 100644 (file)
--- a/quantum/agent/dhcp_agent.py
+++ b/quantum/agent/dhcp_agent.py
@@ -410,7 +410,8 @@ class DeviceManager(object):
         cfg.StrOpt('admin_user',
                    help=_("Admin username")),
         cfg.StrOpt('admin_password',
-                   help=_("Admin password")),
+                   help=_("Admin password"),
+                   secret=True),
         cfg.StrOpt('admin_tenant_name',
                    help=_("Admin tenant name")),
         cfg.StrOpt('auth_url',

diff --git a/quantum/agent/metadata/agent.py b/quantum/agent/metadata/agent.py
index 825125dcbb94aebf9cc50d55e8433eab059b6758..ec144f2065df42ace4f3f3ff3e9e6d6ee155e677 100644 (file)
--- a/quantum/agent/metadata/agent.py
+++ b/quantum/agent/metadata/agent.py
@@ -42,7 +42,8 @@ class MetadataProxyHandler(object):
         cfg.StrOpt('admin_user',
                    help=_("Admin user")),
         cfg.StrOpt('admin_password',
-                   help=_("Admin password")),
+                   help=_("Admin password"),
+                   secret=True),
         cfg.StrOpt('admin_tenant_name',
                    help=_("Admin tenant name")),
         cfg.StrOpt('auth_url',
@@ -58,7 +59,8 @@ class MetadataProxyHandler(object):
                    help=_("TCP Port used by Nova metadata server.")),
         cfg.StrOpt('metadata_proxy_shared_secret',
                    default='',
-                   help=_('Shared secret to sign instance-id request'))
+                   help=_('Shared secret to sign instance-id request'),
+                   secret=True)
     ]
 
     def __init__(self, conf):

diff --git a/quantum/debug/debug_agent.py b/quantum/debug/debug_agent.py
index 27c3f69f7eaf05d15832a5c7d91d22f3d390df4b..de874f1d50ad0572c2d3b5974fade6e11cd5bedd 100644 (file)
--- a/quantum/debug/debug_agent.py
+++ b/quantum/debug/debug_agent.py
@@ -40,7 +40,8 @@ class QuantumDebugAgent():
         cfg.StrOpt('admin_user',
                    help=_("Admin user")),
         cfg.StrOpt('admin_password',
-                   help=_("Admin password")),
+                   help=_("Admin password"),
+                   secret=True),
         cfg.StrOpt('admin_tenant_name',
                    help=_("Admin tenant name")),
         cfg.StrOpt('auth_url',

diff --git a/quantum/plugins/bigswitch/plugin.py b/quantum/plugins/bigswitch/plugin.py
index 9cfb2aaada346809a42cf939c493abe821aac2a1..5105da748ed124f5c3649b1abfd424eb2b464401 100644 (file)
--- a/quantum/plugins/bigswitch/plugin.py
+++ b/quantum/plugins/bigswitch/plugin.py
@@ -70,7 +70,8 @@ restproxy_opts = [
                help=_("A comma separated list of servers and port numbers "
                       "to proxy request to.")),
     cfg.StrOpt('serverauth', default='username:password',
-               help=_("Server authentication")),
+               help=_("Server authentication"),
+               secret=True),
     cfg.BoolOpt('serverssl', default=False,
                 help=_("Use SSL to connect")),
     cfg.BoolOpt('syncdata', default=False,

diff --git a/quantum/plugins/metaplugin/common/config.py b/quantum/plugins/metaplugin/common/config.py
index cf0e354f8626ec031102b917cc8f4298c7f5b79d..b92541c69195e7f126613bc661782db925ffc7d5 100644 (file)
--- a/quantum/plugins/metaplugin/common/config.py
+++ b/quantum/plugins/metaplugin/common/config.py
@@ -37,7 +37,8 @@ proxy_plugin_opts = [
     cfg.StrOpt('admin_user',
                help=_("Admin user")),
     cfg.StrOpt('admin_password',
-               help=_("Admin password")),
+               help=_("Admin password"),
+               secret=True),
     cfg.StrOpt('admin_tenant_name',
                help=_("Admin tenant name")),
     cfg.StrOpt('auth_url',