Merge "Disables the clear text password UI by default"

This commit is contained in:
Jenkins 2014-03-21 06:30:39 +00:00 committed by Gerrit Code Review
commit 537dbacdcc
3 changed files with 4 additions and 4 deletions

View File

@ -265,7 +265,7 @@ Default::
{
'can_set_mount_point': False,
'can_set_password': True
'can_set_password': False
}
A dictionary containing settings which can be used to identify the
@ -276,7 +276,7 @@ to instances (other Hypervisors currently do not). Setting
``can_set_mount_point`` to ``True`` will add the option to set the mount point
from the UI.
Setting ``can_set_password`` to ``False`` will remove the option to set
Setting ``can_set_password`` to ``True`` will enable the option to set
an administrator password when launching or rebuilding an instance.

View File

@ -762,4 +762,4 @@ def extension_supported(extension_name, request):
def can_set_server_password():
features = getattr(settings, 'OPENSTACK_HYPERVISOR_FEATURES', {})
return features.get('can_set_password', True)
return features.get('can_set_password', False)

View File

@ -160,7 +160,7 @@ OPENSTACK_KEYSTONE_BACKEND = {
# from the UI.
OPENSTACK_HYPERVISOR_FEATURES = {
'can_set_mount_point': False,
'can_set_password': True,
'can_set_password': False,
}
# The OPENSTACK_NEUTRON_NETWORK settings can be used to enable optional