Add service_down_time support to get rid of false positive service downtime
diff --git a/nova/files/juno/nova-controller.conf.Debian b/nova/files/juno/nova-controller.conf.Debian
index 0415ff6..263539b 100644
--- a/nova/files/juno/nova-controller.conf.Debian
+++ b/nova/files/juno/nova-controller.conf.Debian
@@ -40,6 +40,8 @@
network_api_class = nova.network.neutronv2.api.API
{%- endif %}
+service_down_time = {{ controller.service_down_time|default('180') }}
+
compute_driver = libvirt.LibvirtDriver
libvirt_type=kvm
rootwrap_config = /etc/nova/rootwrap.conf
diff --git a/nova/files/kilo/nova-controller.conf.Debian b/nova/files/kilo/nova-controller.conf.Debian
index 99dfe00..c86039a 100644
--- a/nova/files/kilo/nova-controller.conf.Debian
+++ b/nova/files/kilo/nova-controller.conf.Debian
@@ -36,6 +36,8 @@
api_paste_config=/etc/nova/api-paste.ini
volumes_path=/var/lib/nova/volumes
+service_down_time = {{ controller.service_down_time|default('180') }}
+
sql_connection = {{ controller.database.engine }}://{{ controller.database.user }}:{{ controller.database.password }}@{{ controller.database.host }}/{{ controller.database.name }}
network_api_class = nova.network.neutronv2.api.API
diff --git a/nova/files/liberty/nova-controller.conf.Debian b/nova/files/liberty/nova-controller.conf.Debian
index 0c2f11a..e33c50e 100644
--- a/nova/files/liberty/nova-controller.conf.Debian
+++ b/nova/files/liberty/nova-controller.conf.Debian
@@ -29,6 +29,8 @@
allow_resize_to_same_host = True
+service_down_time = {{ controller.service_down_time|default('180') }}
+
logdir=/var/log/nova
iscsi_helper=tgtadm
connection_type=libvirt
diff --git a/nova/files/mitaka/nova-controller.conf.Debian b/nova/files/mitaka/nova-controller.conf.Debian
index 7c9b434..ea881bc 100644
--- a/nova/files/mitaka/nova-controller.conf.Debian
+++ b/nova/files/mitaka/nova-controller.conf.Debian
@@ -29,6 +29,9 @@
allow_resize_to_same_host = True
osapi_max_limit = {{ controller.osapi_max_limit|default('1000') }}
+service_down_time = {{ controller.service_down_time|default('180') }}
+
+
iscsi_helper=tgtadm
connection_type=libvirt
root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf
diff --git a/nova/files/newton/nova-controller.conf.Debian b/nova/files/newton/nova-controller.conf.Debian
index dee5e52..6a96361 100644
--- a/nova/files/newton/nova-controller.conf.Debian
+++ b/nova/files/newton/nova-controller.conf.Debian
@@ -52,6 +52,8 @@
my_ip={{ controller.bind.private_address }}
fping_path=/usr/bin/fping
+service_down_time = {{ controller.service_down_time|default('180') }}
+
use_neutron = True
firewall_driver = nova.virt.firewall.NoopFirewallDriver
diff --git a/nova/files/ocata/nova-controller.conf.Debian b/nova/files/ocata/nova-controller.conf.Debian
index 6777fa7..eddcbb3 100644
--- a/nova/files/ocata/nova-controller.conf.Debian
+++ b/nova/files/ocata/nova-controller.conf.Debian
@@ -2603,7 +2603,7 @@
#
# * report_interval (service_down_time should not be less than report_interval)
# (integer value)
-#service_down_time=60
+service_down_time = {{ controller.service_down_time|default('180') }}
#
# Enable periodic tasks.