Merge "Bump containerd version"
diff --git a/defaults/docker_images.yml b/defaults/docker_images.yml
index 6dba818..8207c87 100644
--- a/defaults/docker_images.yml
+++ b/defaults/docker_images.yml
@@ -41,6 +41,8 @@
# keycloak
docker_image_keycloak_server: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:4.5.0.Final"
docker_image_keycloak_proxy: "${_param:mcp_docker_registry}/mirantis/external/jboss/keycloak:3.4.2.Final"
+ # CVP
+ docker_image_cvp_sanity_checks: ${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:${_param:mcp_version}
# aptly
docker_image_aptly:
base: "${_param:mcp_docker_registry}/mirantis/cicd/aptly:${_param:mcp_version}"
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/jenkins/client/job/validate.yml b/jenkins/client/job/validate.yml
index bde6f77..9f20fc9 100644
--- a/jenkins/client/job/validate.yml
+++ b/jenkins/client/job/validate.yml
@@ -198,7 +198,7 @@
param:
IMAGE:
type: string
- default: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:${_param:mcp_version}"
+ default: ${_param:docker_image_cvp_sanity_checks}
description: Docker image with tests and all pip dependecies to use for testing
SALT_MASTER_URL:
type: string
@@ -452,7 +452,7 @@
param:
IMAGE:
type: string
- default: "${_param:mcp_docker_registry}/mirantis/cvp/cvp-sanity-checks:${_param:mcp_version}"
+ default: ${_param:docker_image_cvp_sanity_checks}
description: Docker image with tests and all pip dependecies to use for testing
SALT_MASTER_URL:
type: string
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}