diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-05 16:26:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-05 16:26:21 +0000 |
| commit | 868a530aa65de371ffae6e0afb271ff96fe1201f (patch) | |
| tree | e3d3d6f8eef6ec306bf3e56e7d49a716cfc5ca30 | |
| parent | ad4192ad1ecfab5a63ce126bfb5defda7dcb1796 (diff) | |
| parent | 8feb2a43c1693fc1f64358dca4cfe77fa83db378 (diff) | |
| download | oslo-868a530aa65de371ffae6e0afb271ff96fe1201f.tar.gz oslo-868a530aa65de371ffae6e0afb271ff96fe1201f.tar.xz oslo-868a530aa65de371ffae6e0afb271ff96fe1201f.zip | |
Merge "Mark password config options with secret"
| -rw-r--r-- | openstack/common/rpc/impl_kombu.py | 3 | ||||
| -rw-r--r-- | openstack/common/rpc/impl_qpid.py | 3 |
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'), |