Enable cinder cache options
Set default TTL for memcache item expiration:
expiration_time = 600
backend_argument = memcached_expire_time:660
Includes oslo_templates/files/~ controller.version ~/oslo/_cache.conf
settings in the [cache] section of cinder.conf
Change-Id: Iff612c45178c64bdf8a6acd489e9f0c99c829ba2
Related-Prod: PROD-26960
diff --git a/cinder/files/queens/cinder.conf.controller.Debian b/cinder/files/queens/cinder.conf.controller.Debian
index 54b8a04..d034ef5 100644
--- a/cinder/files/queens/cinder.conf.controller.Debian
+++ b/cinder/files/queens/cinder.conf.controller.Debian
@@ -3338,3 +3338,9 @@
{%- set _data = controller.reports %}
{%- include "oslo_templates/files/queens/oslo/_reports.conf" %}
{%- endif %}
+
+[cache]
+{%- if controller.cache is defined %}
+{%- set _data = controller.cache %}
+{%- include "oslo_templates/files/queens/oslo/_cache.conf" %}
+{%- endif %}
diff --git a/cinder/files/queens/cinder.conf.volume.Debian b/cinder/files/queens/cinder.conf.volume.Debian
index 6989cce..3c60abc 100644
--- a/cinder/files/queens/cinder.conf.volume.Debian
+++ b/cinder/files/queens/cinder.conf.volume.Debian
@@ -3341,3 +3341,9 @@
{%- set _data = volume.reports %}
{%- include "oslo_templates/files/queens/oslo/_reports.conf" %}
{%- endif %}
+
+[cache]
+{%- if volume.cache is defined %}
+{%- set _data = volume.cache %}
+{%- include "oslo_templates/files/queens/oslo/_cache.conf" %}
+{%- endif %}
diff --git a/cinder/files/rocky/cinder.conf.controller.Debian b/cinder/files/rocky/cinder.conf.controller.Debian
index bb2cb2c..7f349b3 100644
--- a/cinder/files/rocky/cinder.conf.controller.Debian
+++ b/cinder/files/rocky/cinder.conf.controller.Debian
@@ -3956,6 +3956,11 @@
{%- include "oslo_templates/files/" ~ controller.version ~ "/oslo/_osprofiler.conf" %}
{%- endif %}
+[cache]
+{%- if controller.cache is defined %}
+{%- set _data = controller.cache %}
+{%- include "oslo_templates/files/" ~ controller.version ~ "/oslo/_cache.conf" %}
+{%- endif %}
[sample_remote_file_source]
# Example of using a remote_file source
diff --git a/cinder/files/rocky/cinder.conf.volume.Debian b/cinder/files/rocky/cinder.conf.volume.Debian
index a9dd2ad..2bbe2ba 100644
--- a/cinder/files/rocky/cinder.conf.volume.Debian
+++ b/cinder/files/rocky/cinder.conf.volume.Debian
@@ -3942,6 +3942,11 @@
{%- include "oslo_templates/files/" ~ volume.version ~ "/oslo/_reports.conf" %}
{%- endif %}
+[cache]
+{%- if volume.cache is defined %}
+{%- set _data = volume.cache %}
+{%- include "oslo_templates/files/" ~ volume.version ~ "/oslo/_cache.conf" %}
+{%- endif %}
[oslo_versionedobjects]
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index f4dc5d0..5e3b0a1 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -51,6 +51,10 @@
virtual_host: '/openstack'
cache:
engine: memcached
+ expiration_time: 600
+ backend_argument:
+ memcached_expire_time:
+ value: 660
members:
- host: ${_param:cluster_node01_address}
port: 11211
diff --git a/metadata/service/control/cluster_control.yml b/metadata/service/control/cluster_control.yml
index f4dc5d0..5e3b0a1 100644
--- a/metadata/service/control/cluster_control.yml
+++ b/metadata/service/control/cluster_control.yml
@@ -51,6 +51,10 @@
virtual_host: '/openstack'
cache:
engine: memcached
+ expiration_time: 600
+ backend_argument:
+ memcached_expire_time:
+ value: 660
members:
- host: ${_param:cluster_node01_address}
port: 11211
diff --git a/metadata/service/volume/local.yml b/metadata/service/volume/local.yml
index bfa8020..bece0dc 100644
--- a/metadata/service/volume/local.yml
+++ b/metadata/service/volume/local.yml
@@ -51,6 +51,10 @@
virtual_host: '/openstack'
cache:
engine: memcached
+ expiration_time: 600
+ backend_argument:
+ memcached_expire_time:
+ value: 660
members:
- host: ${_param:single_address}
diff --git a/metadata/service/volume/single.yml b/metadata/service/volume/single.yml
index 1b2b72f..a709f0c 100644
--- a/metadata/service/volume/single.yml
+++ b/metadata/service/volume/single.yml
@@ -51,6 +51,10 @@
virtual_host: '/openstack'
cache:
engine: memcached
+ expiration_time: 600
+ backend_argument:
+ memcached_expire_time:
+ value: 660
members:
- host: ${_param:cluster_node01_address}
port: 11211
diff --git a/tests/pillar/control_cluster.sls b/tests/pillar/control_cluster.sls
index 3c106dd..05456c0 100644
--- a/tests/pillar/control_cluster.sls
+++ b/tests/pillar/control_cluster.sls
@@ -58,6 +58,10 @@
enabled: true
strategy: ENCRYPT
secret_key: secret
+ expiration_time: 600
+ backend_argument:
+ memcached_expire_time:
+ value: 660
storage:
engine: storwize
host: 192.168.0.1
diff --git a/tests/pillar/volume_single.sls b/tests/pillar/volume_single.sls
index cea5f55..e81a2cd 100644
--- a/tests/pillar/volume_single.sls
+++ b/tests/pillar/volume_single.sls
@@ -68,6 +68,10 @@
enabled: true
strategy: ENCRYPT
secret_key: secret
+ expiration_time: 600
+ backend_argument:
+ memcached_expire_time:
+ value: 660
apache:
server:
enabled: true