By default do not associate access keypair to member create

Change-Id: I63571a3de862018377184f47dc500053545046ae
Closes-Bug: #1558540
This commit is contained in:
ank 2016-03-18 13:01:24 +05:30
parent e524e6b215
commit dcdcb31a64
1 changed files with 2 additions and 6 deletions

View File

@ -354,16 +354,12 @@ class SetAccessControlsAction(workflows.Action):
def __init__(self, request, *args, **kwargs):
super(SetAccessControlsAction, self).__init__(request, *args, **kwargs)
self.fields['keypair'].choices = instance_utils.keypair_field_data(
request, True)
if not api.nova.can_set_server_password():
del self.fields['admin_pass']
del self.fields['confirm_admin_pass']
def populate_keypair_choices(self, request, context):
keypairs = instance_utils.keypair_field_data(request, True)
if len(keypairs) == 2:
self.fields['keypair'].initial = keypairs[1][0]
return keypairs
def clean(self):
'''Check to make sure password fields match.'''
cleaned_data = super(SetAccessControlsAction, self).clean()