Allow to deploy with custom kubernetes runtime
Related-Prod: PRODX-42391
Change-Id: I20c6cc7a8f5a6e19cea66e158a781a9f7394187d
diff --git a/de/heat-templates/fragments/SrvInstancesBM.yaml b/de/heat-templates/fragments/SrvInstancesBM.yaml
index 3cb80ee..196f985 100644
--- a/de/heat-templates/fragments/SrvInstancesBM.yaml
+++ b/de/heat-templates/fragments/SrvInstancesBM.yaml
@@ -48,6 +48,8 @@
type: string
docker_ee_packages:
type: string
+ kubernetes_container_runtime:
+ type: string
docker_ee_url:
type: string
docker_ucp_image:
@@ -79,6 +81,7 @@
$wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
$docker_ee_url: { get_param: docker_ee_url }
$docker_ee_packages: { get_param: docker_ee_packages }
+ $kubernetes_container_runtime: { get_param: kubernetes_container_runtime }
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
$docker_ucp_image: { get_param: docker_ucp_image }
diff --git a/de/heat-templates/fragments/SrvInstancesBMCeph.yaml b/de/heat-templates/fragments/SrvInstancesBMCeph.yaml
index ad2a702..ded0ea3 100644
--- a/de/heat-templates/fragments/SrvInstancesBMCeph.yaml
+++ b/de/heat-templates/fragments/SrvInstancesBMCeph.yaml
@@ -72,6 +72,8 @@
type: string
docker_ee_packages:
type: string
+ kubernetes_container_runtime:
+ type: string
docker_ee_url:
type: string
hardware_metadata:
@@ -96,6 +98,7 @@
$wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
$docker_ee_url: { get_param: docker_ee_url }
$docker_ee_packages: { get_param: docker_ee_packages }
+ $kubernetes_container_runtime: { get_param: kubernetes_container_runtime }
$docker_ee_release: { get_param: docker_ee_release }
$binary_base_url: { get_param: binary_base_url }
$ucp_master_host: { get_param: ucp_master_host }
diff --git a/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml b/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
index 0c92f7a..6791060 100644
--- a/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
+++ b/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
@@ -86,6 +86,8 @@
type: string
docker_ee_packages:
type: string
+ kubernetes_container_runtime:
+ type: string
docker_ee_url:
type: string
hardware_metadata:
@@ -117,6 +119,7 @@
$wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
$docker_ee_url: { get_param: docker_ee_url }
$docker_ee_packages: { get_param: docker_ee_packages }
+ $kubernetes_container_runtime: { get_param: kubernetes_container_runtime }
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
$docker_ucp_image: { get_param: docker_ucp_image }
diff --git a/de/heat-templates/fragments/SrvInstancesVM.yaml b/de/heat-templates/fragments/SrvInstancesVM.yaml
index 374ec92..fd83b44 100644
--- a/de/heat-templates/fragments/SrvInstancesVM.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVM.yaml
@@ -47,6 +47,8 @@
type: string
docker_ee_packages:
type: string
+ kubernetes_container_runtime:
+ type: string
docker_ee_url:
type: string
docker_ucp_image:
@@ -101,6 +103,7 @@
$wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
$docker_ee_url: { get_param: docker_ee_url }
$docker_ee_packages: { get_param: docker_ee_packages }
+ $kubernetes_container_runtime: { get_param: kubernetes_container_runtime }
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
$node_metadata: { get_param: metadata }
diff --git a/de/heat-templates/fragments/SrvInstancesVMCeph.yaml b/de/heat-templates/fragments/SrvInstancesVMCeph.yaml
index 320b564..cc1099b 100644
--- a/de/heat-templates/fragments/SrvInstancesVMCeph.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVMCeph.yaml
@@ -71,6 +71,8 @@
type: string
docker_ee_packages:
type: string
+ kubernetes_container_runtime:
+ type: string
docker_ee_url:
type: string
hardware_metadata:
@@ -110,6 +112,7 @@
$wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
$docker_ee_url: { get_param: docker_ee_url }
$docker_ee_packages: { get_param: docker_ee_packages }
+ $kubernetes_container_runtime: { get_param: kubernetes_container_runtime }
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
$docker_ucp_image: { get_param: docker_ucp_image }
diff --git a/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml b/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
index dff89f5..e7834e2 100644
--- a/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
@@ -85,6 +85,8 @@
type: string
docker_ee_packages:
type: string
+ kubernetes_container_runtime:
+ type: string
docker_ee_url:
type: string
hardware_metadata:
@@ -143,6 +145,7 @@
$wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
$docker_ee_url: { get_param: docker_ee_url }
$docker_ee_packages: { get_param: docker_ee_packages }
+ $kubernetes_container_runtime: { get_param: kubernetes_container_runtime }
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
$docker_ucp_image: { get_param: docker_ucp_image }
diff --git a/de/heat-templates/fragments/multirack/CentralSite.yaml b/de/heat-templates/fragments/multirack/CentralSite.yaml
index c8b98b2..e56b413 100644
--- a/de/heat-templates/fragments/multirack/CentralSite.yaml
+++ b/de/heat-templates/fragments/multirack/CentralSite.yaml
@@ -23,6 +23,8 @@
type: string
docker_ee_packages:
type: string
+ kubernetes_container_runtime:
+ type: string
docker_ee_url:
type: string
docker_ucp_image:
@@ -170,6 +172,7 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
docker_ee_packages: { get_param: docker_ee_packages }
+ kubernetes_container_runtime: { get_param: kubernetes_container_runtime }
docker_ucp_image: { get_param: docker_ucp_image}
docker_default_address_pool: { get_param: docker_default_address_pool }
node_type: "ucp"
@@ -201,6 +204,7 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
docker_ee_packages: { get_param: docker_ee_packages }
+ kubernetes_container_runtime: { get_param: kubernetes_container_runtime }
docker_ucp_image: { get_param: docker_ucp_image}
docker_default_address_pool: { get_param: docker_default_address_pool }
node_type: "worker"
@@ -242,6 +246,7 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
docker_ee_packages: { get_param: docker_ee_packages }
+ kubernetes_container_runtime: { get_param: kubernetes_container_runtime }
docker_ucp_image: { get_param: docker_ucp_image}
docker_default_address_pool: { get_param: docker_default_address_pool }
node_type: "worker"
diff --git a/de/heat-templates/fragments/multirack/Rack.yaml b/de/heat-templates/fragments/multirack/Rack.yaml
index cfbd1d7..16dc350 100644
--- a/de/heat-templates/fragments/multirack/Rack.yaml
+++ b/de/heat-templates/fragments/multirack/Rack.yaml
@@ -27,6 +27,8 @@
type: string
docker_ee_packages:
type: string
+ kubernetes_container_runtime:
+ type: string
docker_ee_url:
type: string
docker_ucp_image:
@@ -84,6 +86,7 @@
docker_ee_url: { get_param: docker_ee_url }
docker_ee_release: { get_param: docker_ee_release }
docker_ee_packages: { get_param: docker_ee_packages }
+ kubernetes_container_runtime: { get_param: kubernetes_container_runtime }
docker_ucp_image: { get_param: docker_ucp_image}
node_type: "worker"
kubernetes_installer: { get_param: kubernetes_installer }
diff --git a/de/heat-templates/fragments/multirack/SrvInstancesVM.yaml b/de/heat-templates/fragments/multirack/SrvInstancesVM.yaml
index dc437b2..ac28eed 100644
--- a/de/heat-templates/fragments/multirack/SrvInstancesVM.yaml
+++ b/de/heat-templates/fragments/multirack/SrvInstancesVM.yaml
@@ -49,6 +49,8 @@
type: string
docker_ee_packages:
type: string
+ kubernetes_container_runtime:
+ type: string
docker_ucp_image:
type: string
default: 'docker/ucp:3.2.4'
@@ -75,6 +77,7 @@
$docker_ee_url: { get_param: docker_ee_url }
$docker_ee_release: { get_param: docker_ee_release }
$docker_ee_packages: { get_param: docker_ee_packages }
+ $kubernetes_container_runtime: { get_param: kubernetes_container_runtime }
$ucp_master_host: { get_param: ucp_master_host }
$docker_ucp_image: { get_param: docker_ucp_image }
$node_metadata: { get_param: metadata }
diff --git a/de/heat-templates/fragments/multirack/SrvInstancesVMCeph.yaml b/de/heat-templates/fragments/multirack/SrvInstancesVMCeph.yaml
index 288d03c..04f5aaf 100644
--- a/de/heat-templates/fragments/multirack/SrvInstancesVMCeph.yaml
+++ b/de/heat-templates/fragments/multirack/SrvInstancesVMCeph.yaml
@@ -46,6 +46,8 @@
type: string
docker_ee_packages:
type: string
+ kubernetes_container_runtime:
+ type: string
docker_ee_url:
type: string
docker_ucp_image:
@@ -104,6 +106,7 @@
$docker_ee_url: { get_param: docker_ee_url }
$docker_ee_release: { get_param: docker_ee_release }
$docker_ee_packages: { get_param: docker_ee_packages }
+ $kubernetes_container_runtime: { get_param: kubernetes_container_runtime }
$ucp_master_host: { get_param: ucp_master_host }
$docker_ucp_image: { get_param: docker_ucp_image }
$node_metadata: { get_param: metadata }
diff --git a/de/heat-templates/fragments/multirack/SrvInstancesVMRack.yaml b/de/heat-templates/fragments/multirack/SrvInstancesVMRack.yaml
index 8efb30a..118e376 100644
--- a/de/heat-templates/fragments/multirack/SrvInstancesVMRack.yaml
+++ b/de/heat-templates/fragments/multirack/SrvInstancesVMRack.yaml
@@ -39,6 +39,8 @@
type: string
docker_ee_packages:
type: string
+ kubernetes_container_runtime:
+ type: string
docker_ee_url:
type: string
docker_ucp_image:
@@ -68,6 +70,7 @@
$wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
$docker_ee_url: { get_param: docker_ee_url }
$docker_ee_packages: { get_param: docker_ee_packages }
+ $kubernetes_container_runtime: { get_param: kubernetes_container_runtime }
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
$docker_ucp_image: { get_param: docker_ucp_image }