Revert "Enable oslo.cache library"
This reverts commit 7edb13c9e7908de42e07900da6a4b2e6499a470b.
Related-Prod: PROD-28614
Change-Id: Ieb10951ab36b1639378c042f6d65968fb34d3b4d
diff --git a/manila/files/queens/manila.conf b/manila/files/queens/manila.conf
index b39dcfa..08bc897 100644
--- a/manila/files/queens/manila.conf
+++ b/manila/files/queens/manila.conf
@@ -1737,8 +1737,3 @@
{%- endfor %}
{%- endif %}
-{%- if server.cache is defined %}
-{%- set _data = server.cache %}
-[cache]
-{%- include "oslo_templates/files/queens/oslo/_cache.conf" %}
-{%- endif %}
diff --git a/manila/files/rocky/manila.conf b/manila/files/rocky/manila.conf
index a2606f4..f8c40e0 100644
--- a/manila/files/rocky/manila.conf
+++ b/manila/files/rocky/manila.conf
@@ -1792,9 +1792,3 @@
# Sets the list of available ciphers. value should be a string in the
# OpenSSL cipher list format. (string value)
#ciphers = <None>
-
-{%- if server.cache is defined %}
-{%- set _data = server.cache %}
-[cache]
-{%- include "oslo_templates/files/rocky/oslo/_cache.conf" %}
-{%- endif %}
diff --git a/metadata/service/common/cluster.yml b/metadata/service/common/cluster.yml
index 3d4f172..bcce15f 100644
--- a/metadata/service/common/cluster.yml
+++ b/metadata/service/common/cluster.yml
@@ -43,16 +43,3 @@
enabled: ${_param:openstack_fluentd_handler_enabled}
ossyslog:
enabled: ${_param:openstack_ossyslog_handler_enabled}
- cache:
- engine: memcached
- expiration_time: 600
- backend_argument:
- memcached_expire_time:
- value: 660
- members:
- - host: ${_param:openstack_control_node01_address}
- port: 11211
- - host: ${_param:openstack_control_node02_address}
- port: 11211
- - host: ${_param:openstack_control_node03_address}
- port: 11211
diff --git a/metadata/service/common/single.yml b/metadata/service/common/single.yml
index a329043..4919207 100644
--- a/metadata/service/common/single.yml
+++ b/metadata/service/common/single.yml
@@ -43,12 +43,3 @@
enabled: ${_param:openstack_fluentd_handler_enabled}
ossyslog:
enabled: ${_param:openstack_ossyslog_handler_enabled}
- cache:
- engine: memcached
- expiration_time: 600
- backend_argument:
- memcached_expire_time:
- value: 660
- members:
- - host: ${_param:single_address}
- port: 11211
diff --git a/tests/pillar/server_cluster.sls b/tests/pillar/server_cluster.sls
index 4e6ab2c..bae2402 100644
--- a/tests/pillar/server_cluster.sls
+++ b/tests/pillar/server_cluster.sls
@@ -23,10 +23,6 @@
password: misterio
cache:
engine: memcached
- expiration_time: 600
- backend_argument:
- memcached_expire_time:
- value: 660
members:
- host: 127.0.0.1
- host: 127.0.0.1