Fix patching of create instance dialog (part trois)
Previous patch fixed the form but did not fix yet another bug in the original implementation of the patching of the create instance workflow. Namely, the patched logic was always assuming the need for a PTG, and would override the supplied network arguments. This is being fixed here. Also caps the cmd2 dependency whose latest version is incompatible. Change-Id: If0fff67cd2b811853a632055d1609b6057769bb8
This commit is contained in:
parent
93abeefbbb
commit
9ddc2346a0
|
@ -114,7 +114,7 @@ class Members(generic.View):
|
|||
'block_device_mapping_v2',
|
||||
'availability_zone',
|
||||
'admin_pass', 'disk_config',
|
||||
'config_drive'
|
||||
'config_drive', "scheduler_hints"
|
||||
]
|
||||
|
||||
@rest_utils.ajax()
|
||||
|
@ -153,10 +153,17 @@ class Members(generic.View):
|
|||
try:
|
||||
instance_name = request.DATA['name'] + suffix
|
||||
|
||||
meta_data, nics = self.create_ports(request, instance_name)
|
||||
if "group_policy_targets" in request.DATA and (
|
||||
request.DATA["group_policy_targets"]):
|
||||
meta_data, nics = self.create_ports(request, instance_name)
|
||||
|
||||
kw['meta'] = meta_data
|
||||
kw['nics'] = nics
|
||||
kw['meta'] = meta_data
|
||||
kw['nics'] = nics
|
||||
else:
|
||||
if 'nics' in request.DATA:
|
||||
kw['nics'] = request.DATA['nics']
|
||||
if 'meta' in request.DATA:
|
||||
kw['meta'] = request.DATA['meta']
|
||||
|
||||
args = (
|
||||
request,
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
-e git://github.com/openstack/horizon.git@stable/pike#egg=horizon
|
||||
hacking<0.11,>=0.10.0
|
||||
#
|
||||
cmd2<0.9.0
|
||||
coverage!=4.4,>=4.0 # Apache-2.0
|
||||
django-nose>=1.4.4 # BSD
|
||||
mock>=2.0 # BSD
|
||||
|
|
Loading…
Reference in New Issue