diff options
author | Jenkins <jenkins@review.openstack.org> | 2015-03-01 15:40:23 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2015-03-01 15:40:23 +0000 |
commit | 07d340688474aceab85eeddc9468fac83396526d (patch) | |
tree | 1889b8ccbbafed0361620859c896db2bb150d3d9 | |
parent | 585ff1261c19be343f3bf624c75f0ab377a17e07 (diff) | |
parent | 1ccad8c41c9cab2f577e6505daab858a2c9d22b5 (diff) | |
download | os-client-config-07d340688474aceab85eeddc9468fac83396526d.tar.gz |
Merge "Add support for configuring dogpile.cache"0.5.0
-rw-r--r-- | os_client_config/config.py | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/os_client_config/config.py b/os_client_config/config.py index 1be57ce..6bc84e2 100644 --- a/os_client_config/config.py +++ b/os_client_config/config.py @@ -88,11 +88,17 @@ class OpenStackConfig(object): self._cache_max_age = 300 self._cache_path = CACHE_PATH + self._cache_class = 'dogpile.cache.memory' + self._cache_arguments = {} if 'cache' in self.cloud_config: self._cache_max_age = self.cloud_config['cache'].get( 'max_age', self._cache_max_age) self._cache_path = os.path.expanduser( self.cloud_config['cache'].get('path', self._cache_path)) + self._cache_class = self.cloud_config['cache'].get( + 'class', self._cache_class) + self._cache_arguments = self.cloud_config['cache'].get( + 'arguments', self._cache_arguments) def _load_config_file(self): for path in self._config_files: @@ -112,6 +118,12 @@ class OpenStackConfig(object): def get_cache_path(self): return self._cache_path + def get_cache_class(self): + return self._cache_class + + def get_cache_arguments(self): + return self._cache_arguments + def _get_regions(self, cloud): try: return self.cloud_config['clouds'][cloud]['region_name'] |