diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2012-12-12 07:14:12 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-12-12 08:26:59 +0000 |
| commit | 32af3c94bd62c46713a44bf75f2e4989f8b98bc4 (patch) | |
| tree | 6855a1fe7940cc706f07f90c36c5f7e32f356f83 /nova/config.py | |
| parent | ac658aa7d0671fb9b5a0a2c504f4b73dff514da9 (diff) | |
| download | nova-32af3c94bd62c46713a44bf75f2e4989f8b98bc4.tar.gz nova-32af3c94bd62c46713a44bf75f2e4989f8b98bc4.tar.xz nova-32af3c94bd62c46713a44bf75f2e4989f8b98bc4.zip | |
Properly scope password options
enable_instance_password is only used in api.openstack.compute.servers
so move it there.
password_length is passed as a parameter to every generate_password()
call, so just move it into nova.utils and have generate_password()
use it by default.
Note: using a config option as the default value of a kwarg isn't a
good idea because the option value is read when the function is defined
which means you can't control its value during unit tests. Instead we
use password=None as the default.
blueprint: scope-config-opts
Change-Id: I445174515fc2eacc56c7cccecadadd2a7e57d4f4
Diffstat (limited to 'nova/config.py')
| -rw-r--r-- | nova/config.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/nova/config.py b/nova/config.py index ec5ac3ba1..7ae32165a 100644 --- a/nova/config.py +++ b/nova/config.py @@ -209,13 +209,6 @@ global_opts = [ cfg.BoolOpt('use_ipv6', default=False, help='use ipv6'), - cfg.BoolOpt('enable_instance_password', - default=True, - help='Allows use of instance password during ' - 'server creation'), - cfg.IntOpt('password_length', - default=12, - help='Length of generated instance admin passwords'), cfg.IntOpt('service_down_time', default=60, help='maximum time since last check-in for up service'), |