summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjakedahn <jake@ansolabs.com>2011-12-14 16:27:36 -0800
committerjakedahn <jake@ansolabs.com>2011-12-14 16:27:36 -0800
commite7d7643e3ba83a1c43c689406c5eab77539c67a5 (patch)
tree613da99eba2f609897338a8d9c86ac36e0667144
parent4a4c983c01cbb97cb9d86dfce5fd7d410df6686e (diff)
downloadhorizon-e7d7643e3ba83a1c43c689406c5eab77539c67a5.tar.gz
Fixing floating ip allocation.essex-2
Change-Id: Ie229923384fdaf59e5141cf781bfb6f8dc8f30fb
-rw-r--r--horizon/horizon/dashboards/nova/access_and_security/views.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/horizon/horizon/dashboards/nova/access_and_security/views.py b/horizon/horizon/dashboards/nova/access_and_security/views.py
index 217497f40..3e93580fb 100644
--- a/horizon/horizon/dashboards/nova/access_and_security/views.py
+++ b/horizon/horizon/dashboards/nova/access_and_security/views.py
@@ -73,8 +73,6 @@ def index(request):
LOG.exception("ClientException in floating ip index")
messages.error(request,
_('Error fetching floating ips: %s') % e.message)
- allocate_form = FloatingIpAllocate(initial={
- 'tenant_id': request.user.tenant_id})
try:
keypairs = api.keypair_list(request)
except novaclient_exceptions.ClientException, e:
@@ -86,9 +84,10 @@ def index(request):
'floating_ips': floating_ips,
'security_groups': security_groups,
'keypair_delete_form': DeleteKeypair(),
- 'allocate_form': FloatingIpAllocate(),
'disassociate_form': FloatingIpDisassociate(),
'release_form': ReleaseFloatingIp(),
+ 'allocate_form': FloatingIpAllocate(initial={
+ 'tenant_id': request.user.tenant_id}),
'sec_group_create_form': CreateGroup(
initial={'tenant_id': tenant_id}),
'sec_group_delete_form': DeleteGroup.maybe_handle(request,