diff --git a/oslo_cache/backends/memcache_pool.py b/oslo_cache/backends/memcache_pool.py index fa640dc3..4c909949 100644 --- a/oslo_cache/backends/memcache_pool.py +++ b/oslo_cache/backends/memcache_pool.py @@ -56,7 +56,8 @@ class PooledMemcachedBackend(memcached_backend.MemcachedBackend): # Composed from GenericMemcachedBackend's and MemcacheArgs's __init__ def __init__(self, arguments): super(PooledMemcachedBackend, self).__init__(arguments) - if arguments.get('sasl_enabled', False): + if (arguments.get('tls_enabled', False) or + arguments.get('sasl_enabled', False)): self.client_pool = _bmemcache_pool.BMemcacheClientPool( self.url, arguments, diff --git a/oslo_cache/core.py b/oslo_cache/core.py index 288adf32..409592e5 100644 --- a/oslo_cache/core.py +++ b/oslo_cache/core.py @@ -189,6 +189,9 @@ def _build_cache_config(conf): conf_dict['%s.arguments.tls_context' % prefix] = tls_context + # pass the value of tls_enabled to the backend + conf_dict['%s.arguments.tls_enabled' % prefix] = conf.cache.tls_enabled + # NOTE(hberaud): Pymemcache support socket keepalive, If it is enable in # our config then configure it to enable this feature. # The socket keepalive feature means that pymemcache will be able to check diff --git a/releasenotes/notes/use-bmemcache-for-memcache-pool-if-tls-enabled-733d98c265a3a9a1.yaml b/releasenotes/notes/use-bmemcache-for-memcache-pool-if-tls-enabled-733d98c265a3a9a1.yaml new file mode 100644 index 00000000..48c8289b --- /dev/null +++ b/releasenotes/notes/use-bmemcache-for-memcache-pool-if-tls-enabled-733d98c265a3a9a1.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + If tls_enabled=true memcache_pool has been switched to use bmemcached.