commit 5da484b633ea8fdef01d00a6b5ccf099985414cd
author Dmitry Ukov <dukov@mirantis.com> Tue Feb 05 16:56:50 2019 +0400
committer Oleksandr Bryndzii <obryndzii@mirantis.com> Thu Mar 21 17:11:07 2019 +0200
tree 547d99976c7498e7cc004cdc53225ac526ed326e
parent 71e92eb10de826feec475cc4cee660fd9fa2d28e

Set default TTL for memcache item expiration

Fixes: PROD-26960

Change-Id: I8880277c1c0fa3b6cbea1c26fcdf09d13b92a5e8
(cherry picked from commit 25b53070d6d625c58fb4a92728130b6122caae98)

Enable default TTL for memcache item expiration

Includes oslo_templates/files/queens/oslo/_cache.conf file
in the [cache] section of nova.conf

Change-Id: I7e6ed812cc95cb492b255171c12314d89a8343de
Related-Prod: PROD-26960
(cherry picked from commit 068f1534282f5f1d0a8be86c9425e6e5a20d48f4)

tests/pillar/compute_cluster.sls

diff --git a/tests/pillar/compute_cluster.sls b/tests/pillar/compute_cluster.sls
index 4988c0b..67e871a 100644
--- a/tests/pillar/compute_cluster.sls
+++ b/tests/pillar/compute_cluster.sls
@@ -67,6 +67,10 @@
       password: metadata
     cache:
       engine: memcached
+      expiration_time: 600
+      backend_argument:
+        memcached_expire_time:
+          value: 660
       members:
       - host: 127.0.0.1
         port: 11211

tests/pillar/compute_cluster_vmware.sls

diff --git a/tests/pillar/compute_cluster_vmware.sls b/tests/pillar/compute_cluster_vmware.sls
index 8953178..80954dd 100644
--- a/tests/pillar/compute_cluster_vmware.sls
+++ b/tests/pillar/compute_cluster_vmware.sls
@@ -56,6 +56,10 @@
       password: metadata
     cache:
       engine: memcached
+      expiration_time: 600
+      backend_argument:
+        memcached_expire_time:
+          value: 660
       members:
       - host: 127.0.0.1
         port: 11211

tests/pillar/compute_cluster_vmware_queens.sls

diff --git a/tests/pillar/compute_cluster_vmware_queens.sls b/tests/pillar/compute_cluster_vmware_queens.sls
index b704198..006dc1a 100644
--- a/tests/pillar/compute_cluster_vmware_queens.sls
+++ b/tests/pillar/compute_cluster_vmware_queens.sls
@@ -56,6 +56,10 @@
       password: metadata
     cache:
       engine: memcached
+      expiration_time: 600
+      backend_argument:
+        memcached_expire_time:
+          value: 660
       members:
       - host: 127.0.0.1
         port: 11211

tests/pillar/compute_single.sls

diff --git a/tests/pillar/compute_single.sls b/tests/pillar/compute_single.sls
index c2b740a..f92fa3b 100644
--- a/tests/pillar/compute_single.sls
+++ b/tests/pillar/compute_single.sls
@@ -57,6 +57,10 @@
       password: password
     cache:
       engine: memcached
+      expiration_time: 600
+      backend_argument:
+        memcached_expire_time:
+          value: 660
       members:
       - host: 127.0.0.1
         port: 11211

tests/pillar/compute_single_config_drive_options.sls

diff --git a/tests/pillar/compute_single_config_drive_options.sls b/tests/pillar/compute_single_config_drive_options.sls
index 739f876..b64ea64 100644
--- a/tests/pillar/compute_single_config_drive_options.sls
+++ b/tests/pillar/compute_single_config_drive_options.sls
@@ -55,6 +55,10 @@
       password: password
     cache:
       engine: memcached
+      expiration_time: 600
+      backend_argument:
+        memcached_expire_time:
+          value: 660
       members:
       - host: 127.0.0.1
         port: 11211

tests/pillar/control_single.sls

diff --git a/tests/pillar/control_single.sls b/tests/pillar/control_single.sls
index 443e821..0872296 100644
--- a/tests/pillar/control_single.sls
+++ b/tests/pillar/control_single.sls
@@ -74,6 +74,10 @@
       password: password
     cache:
       engine: memcached
+      expiration_time: 600
+      backend_argument:
+        memcached_expire_time:
+          value: 660
       members:
       - host: 127.0.0.1
         port: 11211