import glanceclient
from novaclient.v1_1 import client as nova_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
has_openstack = True
except:
has_openstack = False
class Client:
def __init__(self, username=None, password=None, tenant=None, url=None, token=None, endpoint=None, controller=None, admin=True, *args, **kwds):
- deployment = controller
-
self.has_openstack = has_openstack
- self.url = deployment.auth_url
+ self.url = controller.auth_url
if admin:
- self.username = deployment.admin_user
- self.password = deployment.admin_password
- self.tenant = deployment.admin_tenant
+ self.username = controller.admin_user
+ self.password = controller.admin_password
+ self.tenant = controller.admin_tenant
else:
self.username = None
self.password = None
token = self.keystone.client.tokens.authenticate(username=self.keystone.username, password=self.keystone.password, tenant_name=self.keystone.tenant)
#self.glance = GlanceClient(*args, **kwds)
- self.glanceclient = GlanceClientNew('1', endpoint='http://%s:9292' % hostname, token=token.id, **kwds)
+ self.glanceclient = GlanceClientNew('1', endpoint='https://%s:9292' % hostname, token=token.id, **kwds)
self.nova = NovaClient(*args, **kwds)
# self.nova_db = NovaDB(*args, **kwds)
self.quantum = QuantumClient(*args, **kwds)