diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-04 13:18:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-04 13:18:04 +0000 |
| commit | 7abd9fca23fd54722ae6f696b6b0bc5d736a0d3c (patch) | |
| tree | 7a8f18d19c76de6b1b0f4cc6f746f4fb9a7f1f37 | |
| parent | 7d585b2cdc5f593b293c9e3b150ebf68e547b094 (diff) | |
| parent | 61bb91ff4f1927aed1a3b317edc9d5022e42a0aa (diff) | |
| download | nova-7abd9fca23fd54722ae6f696b6b0bc5d736a0d3c.tar.gz nova-7abd9fca23fd54722ae6f696b6b0bc5d736a0d3c.tar.xz nova-7abd9fca23fd54722ae6f696b6b0bc5d736a0d3c.zip | |
Merge "Mark password config options with secret"
| -rw-r--r-- | nova/network/ldapdns.py | 3 | ||||
| -rw-r--r-- | nova/network/quantumv2/api.py | 3 | ||||
| -rw-r--r-- | nova/virt/powervm/driver.py | 3 | ||||
| -rw-r--r-- | nova/virt/vmwareapi/driver.py | 6 | ||||
| -rw-r--r-- | nova/virt/xenapi/driver.py | 3 |
5 files changed, 12 insertions, 6 deletions
diff --git a/nova/network/ldapdns.py b/nova/network/ldapdns.py index c5ae62899..680b2f435 100644 --- a/nova/network/ldapdns.py +++ b/nova/network/ldapdns.py @@ -33,7 +33,8 @@ ldap_dns_opts = [ help='user for ldap DNS'), cfg.StrOpt('ldap_dns_password', default='password', - help='password for ldap DNS'), + help='password for ldap DNS', + secret=True), cfg.StrOpt('ldap_dns_soa_hostmaster', default='hostmaster@example.org', help='Hostmaster for ldap dns driver Statement of Authority'), diff --git a/nova/network/quantumv2/api.py b/nova/network/quantumv2/api.py index 4a4a74392..ba8b9cb7d 100644 --- a/nova/network/quantumv2/api.py +++ b/nova/network/quantumv2/api.py @@ -38,7 +38,8 @@ quantum_opts = [ cfg.StrOpt('quantum_admin_username', help='username for connecting to quantum in admin context'), cfg.StrOpt('quantum_admin_password', - help='password for connecting to quantum in admin context'), + help='password for connecting to quantum in admin context', + secret=True), cfg.StrOpt('quantum_admin_tenant_name', help='tenant name for connecting to quantum in admin context'), cfg.StrOpt('quantum_region_name', diff --git a/nova/virt/powervm/driver.py b/nova/virt/powervm/driver.py index 0ce313535..6679c38f9 100644 --- a/nova/virt/powervm/driver.py +++ b/nova/virt/powervm/driver.py @@ -37,7 +37,8 @@ powervm_opts = [ help='PowerVM manager user name'), cfg.StrOpt('powervm_mgr_passwd', default=None, - help='PowerVM manager user password'), + help='PowerVM manager user password', + secret=True), cfg.StrOpt('powervm_img_remote_path', default=None, help='PowerVM image remote path'), diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py index 67822f2c9..dadfd5ca8 100644 --- a/nova/virt/vmwareapi/driver.py +++ b/nova/virt/vmwareapi/driver.py @@ -70,7 +70,8 @@ vmwareapi_opts = [ default=None, help='Password for connection to VMware ESX host. ' 'Used only if compute_driver is ' - 'vmwareapi.VMwareESXDriver.'), + 'vmwareapi.VMwareESXDriver.', + secret=True), cfg.FloatOpt('vmwareapi_task_poll_interval', default=5.0, help='The interval used for polling of remote tasks. ' @@ -90,7 +91,8 @@ vmwareapi_opts = [ help='Total number of VNC ports'), cfg.StrOpt('vnc_password', default=None, - help='VNC password'), + help='VNC password', + secret=True), cfg.BoolOpt('use_linked_clone', default=True, help='Whether to use linked clone'), diff --git a/nova/virt/xenapi/driver.py b/nova/virt/xenapi/driver.py index a894e95b9..46b759f43 100644 --- a/nova/virt/xenapi/driver.py +++ b/nova/virt/xenapi/driver.py @@ -71,7 +71,8 @@ xenapi_opts = [ cfg.StrOpt('xenapi_connection_password', default=None, help='Password for connection to XenServer/Xen Cloud Platform. ' - 'Used only if compute_driver=xenapi.XenAPIDriver'), + 'Used only if compute_driver=xenapi.XenAPIDriver', + secret=True), cfg.IntOpt('xenapi_connection_concurrent', default=5, help='Maximum number of concurrent XenAPI connections. ' |