summaryrefslogtreecommitdiffstats
path: root/snaps/openstack/os_credentials.py
diff options
context:
space:
mode:
authorspisarski <s.pisarski@cablelabs.com>2017-11-08 12:53:14 -0700
committerspisarski <s.pisarski@cablelabs.com>2017-11-09 09:43:00 -0700
commit788fddade6fc8375cffde4b500a33bdc94c74854 (patch)
treecacaa8ce2f50026a87e0ba452ad28bbb044dfe20 /snaps/openstack/os_credentials.py
parentc0f1fc7d39c550f6825b4e323358d44e876c1fa5 (diff)
Initial patch to begin adding support for Magnum.
JIRA: SNAPS-212 Change-Id: I5f72fe9c28fe5cdd61546eee828becd034f8aff9 Signed-off-by: spisarski <s.pisarski@cablelabs.com>
Diffstat (limited to 'snaps/openstack/os_credentials.py')
-rw-r--r--snaps/openstack/os_credentials.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/snaps/openstack/os_credentials.py b/snaps/openstack/os_credentials.py
index 84ed838..2553410 100644
--- a/snaps/openstack/os_credentials.py
+++ b/snaps/openstack/os_credentials.py
@@ -44,6 +44,8 @@ class OSCreds:
clients
:param volume_api_version: The OpenStack's API version to use
for Cinder clients
+ :param magnum_api_version: The OpenStack's API version to use
+ for magnum clients
:param user_domain_id: Used for v3 APIs (default='default')
:param user_domain_name: Used for v3 APIs (default='Default')
:param project_domain_id: Used for v3 APIs (default='default')
@@ -88,8 +90,12 @@ class OSCreds:
if kwargs.get('volume_api_version') is None:
self.volume_api_version = cinder_utils.VERSION_2
else:
- self.volume_api_version = float(
- kwargs['volume_api_version'])
+ self.volume_api_version = float(kwargs['volume_api_version'])
+
+ if kwargs.get('magnum_api_version') is None:
+ self.magnum_api_version = 1
+ else:
+ self.magnum_api_version = float(kwargs['magnum_api_version'])
self.user_domain_id = kwargs.get('user_domain_id', 'default')