Cleanup of quantum dependencies and imports.

Note: python-gflags is still a dependency for the quantum client,
but the client's setup.py properly lists it as a dependency so
we don't need it in our pip-requires.

Given that we now detect quantum fully from the keystone service catalog,
there are no settings/configuration for it in horizon anymore, and there
are no special dependencies for it beyond the client, I'm
saying that this fixes bug 893466.

Change-Id: I2f31215974082fd354ab7fd274a6643010640fa8

horizon/horizon/api/__init__.py

@@ -36,8 +36,4 @@ from horizon.api.glance import *
 from horizon.api.keystone import *
 from horizon.api.nova import *
 from horizon.api.swift import *
-# Quantum is optional. Ignore it if it's not installed.
-try:
-    from horizon.api.quantum import *
-except ImportError:
-    pass
+from horizon.api.quantum import *

openstack-dashboard/local/local_settings.py.example

@@ -42,8 +42,6 @@ HORIZON_CONFIG = {
 #     ('http://cluster2.example.com:5000/v2.0', 'cluster2'),
 # ]
 
-# FIXME: This is only here so quantum still works. It must be refactored to
-# work with multiple regions.
 OPENSTACK_HOST = "127.0.0.1"
 OPENSTACK_KEYSTONE_URL = "http://%s:5000/v2.0" % OPENSTACK_HOST
 # FIXME: this is only needed until keystone fixes its GET /tenants call

tools/pip-requires

@@ -29,11 +29,9 @@ webob
 xattr
 iso8601
 
-# quantum
--e git+https://github.com/openstack/python-quantumclient.git#egg=python-quantumclient-dev
-python-gflags
 
 # horizon non-pip deps
 -e git+https://github.com/openstack/python-novaclient.git#egg=python-novaclient
 -e git+https://github.com/openstack/python-keystoneclient.git#egg=python-keystoneclient
+-e git+https://github.com/openstack/python-quantumclient.git#egg=python-quantumclient-dev
 -e git+https://github.com/openstack/glance.git#egg=glance