Merge "Updating reference from github to gerrit - Changing Maintainer to dev@mirantis.com"
diff --git a/nova/files/pike/nova-compute.conf.Debian b/nova/files/pike/nova-compute.conf.Debian
index 9988d28..1dad2ae 100644
--- a/nova/files/pike/nova-compute.conf.Debian
+++ b/nova/files/pike/nova-compute.conf.Debian
@@ -852,6 +852,9 @@
# * Any value <=0 will disable the option.
# (integer value)
#reclaim_instance_interval=0
+{%- if compute.reclaim_instance_interval is defined %}
+reclaim_instance_interval = {{ compute.reclaim_instance_interval }}
+{%- endif %}
#
# Interval for gathering volume usages.
diff --git a/nova/files/pike/nova-controller.conf.Debian b/nova/files/pike/nova-controller.conf.Debian
index d4a7c4d..35af0ee 100644
--- a/nova/files/pike/nova-controller.conf.Debian
+++ b/nova/files/pike/nova-controller.conf.Debian
@@ -829,6 +829,9 @@
# * Any value <=0 will disable the option.
# (integer value)
#reclaim_instance_interval=0
+{%- if controller.reclaim_instance_interval is defined %}
+reclaim_instance_interval = {{ controller.reclaim_instance_interval }}
+{%- endif %}
#
# Interval for gathering volume usages.
diff --git a/nova/files/queens/nova-compute.conf.Debian b/nova/files/queens/nova-compute.conf.Debian
index 8d25ff6..54dfd87 100644
--- a/nova/files/queens/nova-compute.conf.Debian
+++ b/nova/files/queens/nova-compute.conf.Debian
@@ -928,6 +928,9 @@
# * Any value <=0 will disable the option.
# (integer value)
#reclaim_instance_interval = 0
+{%- if compute.reclaim_instance_interval is defined %}
+reclaim_instance_interval = {{ compute.reclaim_instance_interval }}
+{%- endif %}
#
# Interval for gathering volume usages.
diff --git a/nova/files/queens/nova-controller.conf.Debian b/nova/files/queens/nova-controller.conf.Debian
index c8dd52e..fbf978b 100644
--- a/nova/files/queens/nova-controller.conf.Debian
+++ b/nova/files/queens/nova-controller.conf.Debian
@@ -916,6 +916,9 @@
# * Any value <=0 will disable the option.
# (integer value)
#reclaim_instance_interval = 0
+{%- if controller.reclaim_instance_interval is defined %}
+reclaim_instance_interval = {{ controller.reclaim_instance_interval }}
+{%- endif %}
#
# Interval for gathering volume usages.
diff --git a/tests/pillar/compute_cluster.sls b/tests/pillar/compute_cluster.sls
index 9534c83..4988c0b 100644
--- a/tests/pillar/compute_cluster.sls
+++ b/tests/pillar/compute_cluster.sls
@@ -97,3 +97,4 @@
dynamic_ownership: 1
consoleauth:
token_ttl: 600
+ reclaim_instance_interval: 60
diff --git a/tests/pillar/compute_single.sls b/tests/pillar/compute_single.sls
index 6a15ae1..c2b740a 100644
--- a/tests/pillar/compute_single.sls
+++ b/tests/pillar/compute_single.sls
@@ -70,3 +70,4 @@
dynamic_ownership: 1
consoleauth:
token_ttl: 600
+ reclaim_instance_interval: 60
diff --git a/tests/pillar/control_cluster.sls b/tests/pillar/control_cluster.sls
index 558a692..e3bf663 100644
--- a/tests/pillar/control_cluster.sls
+++ b/tests/pillar/control_cluster.sls
@@ -77,6 +77,7 @@
enabled: true
consoleauth:
token_ttl: 600
+ reclaim_instance_interval: 60
apache:
server:
enabled: true
diff --git a/tests/pillar/control_single.sls b/tests/pillar/control_single.sls
index 3fff016..443e821 100644
--- a/tests/pillar/control_single.sls
+++ b/tests/pillar/control_single.sls
@@ -87,6 +87,7 @@
'context_is_admin': 'role:admin or role:administrator'
'compute:create': 'rule:admin_or_owner'
'compute:create:attach_network':
+ reclaim_instance_interval: 60
apache:
server:
enabled: true