openstack
/
heat-dashboard
Code Issues Proposed changes

Merge "blueprint quantum-lbaas"

This commit is contained in:
Jenkins 2013-03-06 20:53:32 +00:00 committed by Gerrit Code Review
parent 8dd26aacb8 73c0ae5b0f
commit 665890658c
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openstack_dashboard/api/__init__.py
View File

@ -5,6 +5,7 @@
# All Rights Reserved.
#
# Copyright 2012 Nebula, Inc.
# Copyright 2013 Big Switch Networks
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
@ -32,11 +33,12 @@ In other words, Horizon developers not working on openstack_dashboard.api
shouldn't need to understand the finer details of APIs for
Keystone/Nova/Glance/Swift et. al.
"""
import base
import cinder
import glance
import keystone
import network
import nova
import quantum
import swift
from openstack_dashboard.api import base
from openstack_dashboard.api import cinder
from openstack_dashboard.api import glance
from openstack_dashboard.api import keystone
from openstack_dashboard.api import network
from openstack_dashboard.api import nova
from openstack_dashboard.api import quantum
from openstack_dashboard.api import lbaas
from openstack_dashboard.api import swift

4
openstack_dashboard/test/settings.py
View File

@ -74,6 +74,10 @@ OPENSTACK_KEYSTONE_BACKEND = {
'can_edit_project': True
}
OPENSTACK_QUANTUM_NETWORK = {
'enable_lb': True
}
OPENSTACK_HYPERVISOR_FEATURES = {
'can_set_mount_point': True,