Merged ansible branch into master
diff --git a/planetstack/openstack/client.py b/planetstack/openstack/client.py
index af91387..6974dad 100644
--- a/planetstack/openstack/client.py
+++ b/planetstack/openstack/client.py
@@ -1,15 +1,12 @@
import urlparse
try:
from keystoneclient.v2_0 import client as keystone_client
- from glance import client as glance_client
+ #from glance import client as glance_client
import glanceclient
from novaclient.v1_1 import client as nova_client
- from quantumclient.v2_0 import client as quantum_client
+ from neutronclient.v2_0 import client as quantum_client
from nova.db.sqlalchemy import api as nova_db_api
from nova.context import get_admin_context
- from keystone.common.sql import core
- core.CONF(args=[], project='keystone', default_config_files=['/etc/keystone/keystone.conf'])
- from keystone.identity.backends.sql import Metadata
has_openstack = True
except:
has_openstack = False
@@ -70,17 +67,6 @@
#if '@' in self.username:
# self.username = self.username[:self.username.index('@')]
-class KeystoneDB:
- @require_enabled
- def get_session(self):
- return core.Base().get_session()
-
- @require_enabled
- def get_metadata(self):
- session = self.get_session()
- return session.query(Metadata).all()
-
-
class KeystoneClient(Client):
def __init__(self, *args, **kwds):
Client.__init__(self, *args, **kwds)
@@ -104,7 +90,7 @@
def __init__(self, *args, **kwds):
Client.__init__(self, *args, **kwds)
if has_openstack:
- self.client = glance_client.get_client(host='0.0.0.0',
+ self.client = glanceclient.get_client(host='0.0.0.0',
username=self.username,
password=self.password,
tenant=self.tenant,
@@ -190,12 +176,11 @@
url_parsed = urlparse.urlparse(self.keystone.url)
hostname = url_parsed.netloc.split(':')[0]
token = self.keystone.client.tokens.authenticate(username=self.keystone.username, password=self.keystone.password, tenant_name=self.keystone.tenant)
- self.keystone_db = KeystoneDB()
- self.glance = GlanceClient(*args, **kwds)
+ #self.glance = GlanceClient(*args, **kwds)
self.glanceclient = GlanceClientNew('1', endpoint='http://%s:9292' % hostname, token=token.id, **kwds)
self.nova = NovaClient(*args, **kwds)
- self.nova_db = NovaDB(*args, **kwds)
+ # self.nova_db = NovaDB(*args, **kwds)
self.quantum = QuantumClient(*args, **kwds)
diff --git a/planetstack/openstack/driver.py b/planetstack/openstack/driver.py
index 093ab5a..6fb81a5 100644
--- a/planetstack/openstack/driver.py
+++ b/planetstack/openstack/driver.py
@@ -28,18 +28,18 @@
self.admin_user = None
def client_driver(self, caller=None, tenant=None, deployment=None):
- admin_driver = self.admin_driver(tenant=tenant, deployment=deployment)
if caller:
auth = {'username': caller.email,
'password': hashlib.md5(caller.password).hexdigest()[:6],
'tenant': tenant}
- client = OpenStackClient(deployment=admin_driver.deployment, **auth)
+ client = OpenStackClient(deployment=deployment, **auth)
else:
+ admin_driver = self.admin_driver(tenant=tenant, deployment=deployment)
client = OpenStackClient(tenant=tenant, deployment=admin_driver.deployment)
driver = OpenStackDriver(client=client)
- driver.admin_user = admin_driver.admin_user
- driver.deployment = admin_driver.deployment
+ #driver.admin_user = admin_driver.admin_user
+ #driver.deployment = admin_driver.deployment
return driver
def admin_driver(self, tenant=None, deployment=None):