From dcdcb31a64856769f76c68c1e796291c48e5aad0 Mon Sep 17 00:00:00 2001 From: ank Date: Fri, 18 Mar 2016 13:01:24 +0530 Subject: [PATCH] By default do not associate access keypair to member create Change-Id: I63571a3de862018377184f47dc500053545046ae Closes-Bug: #1558540 --- gbpui/panels/policytargets/workflows.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/gbpui/panels/policytargets/workflows.py b/gbpui/panels/policytargets/workflows.py index d987066..6a9e234 100644 --- a/gbpui/panels/policytargets/workflows.py +++ b/gbpui/panels/policytargets/workflows.py @@ -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()