summaryrefslogtreecommitdiffstats
path: root/openstack
diff options
context:
space:
mode:
authorMichael J Fork <mjfork@us.ibm.com>2013-02-04 15:08:38 +0000
committerMichael J Fork <mjfork@us.ibm.com>2013-02-04 15:09:35 +0000
commit8feb2a43c1693fc1f64358dca4cfe77fa83db378 (patch)
tree67fad4240be0d019caccccc925235592fb81f820 /openstack
parentbd5d9f08ecc3c1fade6dce809ee9edef1c226e54 (diff)
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 oslo-incubator options containing a password. Change-Id: I78451c4fdfdb3d6e28a7bd5f35d1c4c9a1b2be99
Diffstat (limited to 'openstack')
-rw-r--r--openstack/common/rpc/impl_kombu.py3
-rw-r--r--openstack/common/rpc/impl_qpid.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/openstack/common/rpc/impl_kombu.py b/openstack/common/rpc/impl_kombu.py
index f1d46c4..4f3cc7a 100644
--- a/openstack/common/rpc/impl_kombu.py
+++ b/openstack/common/rpc/impl_kombu.py
@@ -66,7 +66,8 @@ kombu_opts = [
help='the RabbitMQ userid'),
cfg.StrOpt('rabbit_password',
default='guest',
- help='the RabbitMQ password'),
+ help='the RabbitMQ password',
+ secret=True),
cfg.StrOpt('rabbit_virtual_host',
default='/',
help='the RabbitMQ virtual host'),
diff --git a/openstack/common/rpc/impl_qpid.py b/openstack/common/rpc/impl_qpid.py
index 9d3a3a7..34262a3 100644
--- a/openstack/common/rpc/impl_qpid.py
+++ b/openstack/common/rpc/impl_qpid.py
@@ -51,7 +51,8 @@ qpid_opts = [
help='Username for qpid connection'),
cfg.StrOpt('qpid_password',
default='',
- help='Password for qpid connection'),
+ help='Password for qpid connection',
+ secret=True),
cfg.StrOpt('qpid_sasl_mechanisms',
default='',
help='Space separated list of SASL mechanisms to use for auth'),