openstack/charm-neutron-api
Code Issues Proposed changes

Sync ch and update InternalEndpointContext

Browse Source 
Change-Id: I2ef5cdf2d59fe5548c54825f9cd60b8c4d1fb555
Partial-Bug: 1733566
This commit is contained in:
Edward Hope-Morley
2017-12-08 10:21:23 +00:00
parent a0a0c39186
commit 575ae704f8
9 changed files with 84 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hooks/charmhelpers/contrib/openstack/context.py
View File

@@ -101,6 +101,8 @@ from charmhelpers.contrib.openstack.utils import (
git_determine_python_path,
enable_memcache,
snap_install_requested,
CompareOpenStackReleases,
os_release,
)
from charmhelpers.core.unitdata import kv
@@ -1566,8 +1568,18 @@ class InternalEndpointContext(OSContextGenerator):
endpoints by default so this allows admins to optionally use internal
endpoints.
"""
def __init__(self, ost_rel_check_pkg_name):
self.ost_rel_check_pkg_name = ost_rel_check_pkg_name
def __call__(self):
return {'use_internal_endpoints': config('use-internal-endpoints')}
ctxt = {'use_internal_endpoints': config('use-internal-endpoints')}
rel = os_release(self.ost_rel_check_pkg_name, base='icehouse')
if CompareOpenStackReleases(rel) >= 'pike':
ctxt['volume_api_version'] = '3'
else:
ctxt['volume_api_version'] = '2'
return ctxt
class AppArmorContext(OSContextGenerator):