diff options
| author |   Steven Pisarski <s.pisarski@cablelabs.com> | 2017-11-09 17:46:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-09 17:46:41 +0000 |
| commit | b59094ae4f53e0da4e4a5fb7c2aece3647d23b8d (patch) | |
| tree | 592d518b2338a81ac5545cc25851dffed98670e8 /snaps/openstack/os_credentials.py | |
| parent | a6b21669ac3a27923cb4053dec645ee9596e1f07 (diff) | |
| parent | 788fddade6fc8375cffde4b500a33bdc94c74854 (diff) | |
Merge "Initial patch to begin adding support for Magnum."
Diffstat (limited to 'snaps/openstack/os_credentials.py')
| -rw-r--r-- | snaps/openstack/os_credentials.py | 10 |
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') |