diff --git a/quantum/agent/dhcp_agent.py b/quantum/agent/dhcp_agent.py
index 5631f4235f..0167e55e7e 100644
--- 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 825125dcbb..ec144f2065 100644
--- 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 27c3f69f7e..de874f1d50 100644
--- 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 9cfb2aaada..5105da748e 100644
--- 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 cf0e354f86..b92541c691 100644
--- 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',