Merge "Rework nova service_user section"
diff --git a/metadata/service/compute/cluster.yml b/metadata/service/compute/cluster.yml
index 9e6e485..8934022 100644
--- a/metadata/service/compute/cluster.yml
+++ b/metadata/service/compute/cluster.yml
@@ -64,6 +64,13 @@
port: 9696
cache:
engine: memcached
+ # NOTE (dukov) Do not change this unless you 100% sure what you are doing
+ expiration_time: 600
+ backend_argument:
+ # NOTE (dukov) WARNING! This parameter depends on expiration_time.
+ # Value of 'memcached_expire_time' must be bigger than 'expiration_time'
+ memcached_expire_time:
+ value: 660
members:
- host: ${_param:cluster_node01_address}
port: 11211
diff --git a/metadata/service/compute/kvm.yml b/metadata/service/compute/kvm.yml
index 0a1925b..4174b56 100644
--- a/metadata/service/compute/kvm.yml
+++ b/metadata/service/compute/kvm.yml
@@ -61,6 +61,13 @@
port: 9696
cache:
engine: memcached
+ # NOTE (dukov) Do not change this unless you 100% sure what you are doing
+ expiration_time: 600
+ backend_argument:
+ # NOTE (dukov) WARNING! This parameter depends on expiration_time.
+ # Value of 'memcached_expire_time' must be bigger than 'expiration_time'
+ memcached_expire_time:
+ value: 660
members:
- host: ${_param:cluster_node01_address}
port: 11211
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index 2e17d93..fa271ff 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -73,6 +73,13 @@
password: metadataPass
cache:
engine: memcached
+ # NOTE (dukov) Do not change this unless you 100% sure what you are doing
+ expiration_time: 600
+ backend_argument:
+ # NOTE (dukov) WARNING! This parameter depends on expiration_time.
+ # Value of 'memcached_expire_time' must be bigger than 'expiration_time'
+ memcached_expire_time:
+ value: 660
members:
- host: ${_param:cluster_node01_address}
port: 11211
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index c525974..5030462 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -74,6 +74,13 @@
password: ${_param:metadata_password}
cache:
engine: memcached
+ # NOTE (dukov) Do not change this unless you 100% sure what you are doing
+ expiration_time: 600
+ backend_argument:
+ # NOTE (dukov) WARNING! This parameter depends on expiration_time.
+ # Value of 'memcached_expire_time' must be bigger than 'expiration_time'
+ memcached_expire_time:
+ value: 660
members:
- host: ${_param:single_address}
port: 11211
diff --git a/tests/pillar/compute_cluster.sls b/tests/pillar/compute_cluster.sls
index 53ff9c6..79f5550 100644
--- a/tests/pillar/compute_cluster.sls
+++ b/tests/pillar/compute_cluster.sls
@@ -69,6 +69,10 @@
password: metadata
cache:
engine: memcached
+ expiration_time: 600
+ backend_argument:
+ memcached_expire_time:
+ value: 660
members:
- host: 127.0.0.1
port: 11211
diff --git a/tests/pillar/compute_cluster_vmware.sls b/tests/pillar/compute_cluster_vmware.sls
index 27de501..4e57b01 100644
--- a/tests/pillar/compute_cluster_vmware.sls
+++ b/tests/pillar/compute_cluster_vmware.sls
@@ -63,6 +63,10 @@
password: metadata
cache:
engine: memcached
+ expiration_time: 600
+ backend_argument:
+ memcached_expire_time:
+ value: 660
members:
- host: 127.0.0.1
port: 11211
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
diff --git a/tests/pillar/compute_single.sls b/tests/pillar/compute_single.sls
index 5677ab6..2ba3222 100644
--- a/tests/pillar/compute_single.sls
+++ b/tests/pillar/compute_single.sls
@@ -58,6 +58,10 @@
password: password
cache:
engine: memcached
+ expiration_time: 600
+ backend_argument:
+ memcached_expire_time:
+ value: 660
members:
- host: 127.0.0.1
port: 11211
diff --git a/tests/pillar/compute_single_config_drive_options.sls b/tests/pillar/compute_single_config_drive_options.sls
index 44c6428..ae57794 100644
--- a/tests/pillar/compute_single_config_drive_options.sls
+++ b/tests/pillar/compute_single_config_drive_options.sls
@@ -56,6 +56,10 @@
password: password
cache:
engine: memcached
+ expiration_time: 600
+ backend_argument:
+ memcached_expire_time:
+ value: 660
members:
- host: 127.0.0.1
port: 11211
diff --git a/tests/pillar/control_single.sls b/tests/pillar/control_single.sls
index 114aee8..467d4b0 100644
--- a/tests/pillar/control_single.sls
+++ b/tests/pillar/control_single.sls
@@ -86,6 +86,10 @@
password: password
cache:
engine: memcached
+ expiration_time: 600
+ backend_argument:
+ memcached_expire_time:
+ value: 660
members:
- host: 127.0.0.1
port: 11211