Set nova instance_build_timeout to 1h by default
This patch configures 1h build instance timeout, when it is reached
instance will be moved to ERROR state. This will prevent having
instances stuck in BUILD state.
The timeout might be changed via _param:nova_instance_build_timeout
Change-Id: Ic695b79e0095fdb5b47d8ad5233896ba678833f1
diff --git a/defaults/openstack/init.yml b/defaults/openstack/init.yml
index 97c1fe8..f9b189e 100644
--- a/defaults/openstack/init.yml
+++ b/defaults/openstack/init.yml
@@ -40,6 +40,7 @@
nova_old_version: ${_param:openstack_old_version}
nova_version: ${_param:openstack_version}
nova_upgrade_enabled: ${_param:openstack_upgrade_enabled}
+ nova_instance_build_timeout: 3600
# Glance
glance_memcache_security_enabled: ${_param:openstack_memcache_security_enabled}
glance_memcache_secret_key: ''
diff --git a/nova/compute/cluster.yml b/nova/compute/cluster.yml
index c3f60f8..7896a97 100644
--- a/nova/compute/cluster.yml
+++ b/nova/compute/cluster.yml
@@ -51,6 +51,7 @@
aggregates: ${_param:nova_aggregates}
heal_instance_info_cache_interval: 60
vncproxy_url: ${_param:nova_vncproxy_url}
+ instance_build_timeout: ${_param:nova_instance_build_timeout}
bind:
vnc_address: ${_param:cluster_local_address}
vnc_port: 6080
diff --git a/nova/compute/single.yml b/nova/compute/single.yml
index 5d161e2..836886e 100644
--- a/nova/compute/single.yml
+++ b/nova/compute/single.yml
@@ -50,6 +50,7 @@
virtualization: kvm
availability_zone: ${_param:nova_compute_avail_zone}
vncproxy_url: ${_param:nova_vncproxy_url}
+ instance_build_timeout: ${_param:nova_instance_build_timeout}
bind:
vnc_address: ${_param:control_address}
vnc_port: 6080
diff --git a/nova/compute_ironic/cluster.yml b/nova/compute_ironic/cluster.yml
index a357ba8..4d49198 100644
--- a/nova/compute_ironic/cluster.yml
+++ b/nova/compute_ironic/cluster.yml
@@ -9,6 +9,7 @@
virtualization: 'baremetal'
pkgs:
- nova-compute-ironic
+ instance_build_timeout: ${_param:nova_instance_build_timeout}
database:
engine: mysql
host: ${_param:openstack_database_address}
diff --git a/nova/compute_ironic/single.yml b/nova/compute_ironic/single.yml
index fe5db6c..befc742 100644
--- a/nova/compute_ironic/single.yml
+++ b/nova/compute_ironic/single.yml
@@ -9,6 +9,7 @@
virtualization: 'baremetal'
pkgs:
- nova-compute-ironic
+ instance_build_timeout: ${_param:nova_instance_build_timeout}
database:
engine: mysql
host: ${_param:control_address}
diff --git a/nova/control/cluster.yml b/nova/control/cluster.yml
index 6591552..72bb558 100644
--- a/nova/control/cluster.yml
+++ b/nova/control/cluster.yml
@@ -33,6 +33,7 @@
disk_allocation_ratio: ${_param:nova_disk_allocation_ratio}
workers: 8
role: ${_param:openstack_node_role}
+ instance_build_timeout: ${_param:nova_instance_build_timeout}
bind:
private_address: ${_param:cluster_local_address}
public_address: ${_param:cluster_vip_address}
diff --git a/nova/control/single.yml b/nova/control/single.yml
index 9a0bc00..d2cb013 100644
--- a/nova/control/single.yml
+++ b/nova/control/single.yml
@@ -13,6 +13,7 @@
nova:
controller:
role: ${_param:openstack_node_role}
+ instance_build_timeout: ${_param:nova_instance_build_timeout}
database:
host: ${_param:single_address}
x509:
diff --git a/opencontrail/compute/single.yml b/opencontrail/compute/single.yml
index 65426c8..6674e34 100644
--- a/opencontrail/compute/single.yml
+++ b/opencontrail/compute/single.yml
@@ -30,6 +30,7 @@
mtu: 9000
nova:
compute:
+ instance_build_timeout: ${_param:nova_instance_build_timeout}
network:
engine: keystone
host: ${_param:control_address}