From 4785d46f01a732c45c2f504ac13306e7a6ce4d3e Mon Sep 17 00:00:00 2001 From: Alexander Ignatov Date: Wed, 4 Dec 2013 22:36:23 +0400 Subject: [PATCH] Reverted floating-ip-pool UUID sending to Savanna This needed for https://review.openstack.org/#/c/55978/ HEAT uses neutronclient and this client raises "NeutronClientException: Invalid input for floating_network_id. Reason: 'public' is not a valid UUID." when template contains network_id 'name' instead of UUID. Also fixed typo in Floating IP label Change-Id: I74c4e4d1f4498000fb4946239c8dbabf34b5bd6a --- savannadashboard/nodegroup_templates/workflows/create.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/savannadashboard/nodegroup_templates/workflows/create.py b/savannadashboard/nodegroup_templates/workflows/create.py index 3a8741b1..d1e15cac 100644 --- a/savannadashboard/nodegroup_templates/workflows/create.py +++ b/savannadashboard/nodegroup_templates/workflows/create.py @@ -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)