openstack
/
sahara-dashboard
Code Issues Proposed changes

Merge "Reverted floating-ip-pool UUID sending to Savanna"

This commit is contained in:
Jenkins 2013-12-05 14:59:30 +00:00 committed by Gerrit Code Review
parent bef88b13de 4785d46f01
commit 076d6f23ad
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
savannadashboard/nodegroup_templates/workflows/create.py
View File

@ -97,11 +97,11 @@ class GeneralConfigAction(workflows.Action):
if not savannaclient.AUTO_ASSIGNMENT_ENABLED:
pools = network.floating_ip_pools_list(request)
pool_choices = [(pool.name, pool.name) for pool in pools]
pool_choices = [(pool.id, pool.name) for pool in pools]
pool_choices.insert(0, (None, "Do not assign floating IPs"))
self.fields['floating_ip_pool'] = forms.ChoiceField(
label=_("Floationg IP pool"),
label=_("Floating IP pool"),
choices=pool_choices,
required=False)