From 49e839c52593eb7e0e1db6ff15de53e91a2aedf8 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Mon, 7 Apr 2014 19:49:01 -0400 Subject: [PATCH] admin 'admin' argument to constructor --- planetstack/openstack/client.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/planetstack/openstack/client.py b/planetstack/openstack/client.py index 16f6b2e..c543947 100644 --- a/planetstack/openstack/client.py +++ b/planetstack/openstack/client.py @@ -40,7 +40,7 @@ def parse_novarc(filename): return opts class Client: - def __init__(self, username=None, password=None, tenant=None, url=None, token=None, endpoint=None, deployment=None, *args, **kwds): + def __init__(self, username=None, password=None, tenant=None, url=None, token=None, endpoint=None, deployment=None, admin=True, *args, **kwds): if not deployment or deployment not in deployment_auth: @@ -48,14 +48,19 @@ class Client: else: auth = deployment_auth[deployment] - self.has_openstack = has_openstack - self.username = auth['user'] - self.password = auth['password'] - self.tenant = auth['tenant'] + self.url = auth['url'] - self.endpoint = auth['endpoint'] - self.token = auth['token'] + if admin: + self.username = auth['user'] + self.password = auth['password'] + self.tenant = auth['tenant'] + self.endpoint = auth['endpoint'] + self.token = auth['token'] + else: + self.username = None + self.password = None + self.tenant = None if username: self.username = username -- 2.43.0