Rework install script to use functions from gerrit
To avoid exceeding configdrive limit move download functons
as a library from gerrit.
Related-Prod: PRODX-3456
Change-Id: I38c8dbff5818fd3362e653ad8b1caa913580d1ec
diff --git a/de/heat-templates/fragments/SrvInstancesBM.yaml b/de/heat-templates/fragments/SrvInstancesBM.yaml
index 06f47c1..3cb80ee 100644
--- a/de/heat-templates/fragments/SrvInstancesBM.yaml
+++ b/de/heat-templates/fragments/SrvInstancesBM.yaml
@@ -72,7 +72,7 @@
group: ungrouped
config:
str_replace:
- template: { get_file: ../scripts/instance_boot.sh }
+ template: { get_file: ../scripts/launch.sh }
params:
$node_type: { get_param: node_type }
$kubernetes_installer: { get_param: kubernetes_installer }
diff --git a/de/heat-templates/fragments/SrvInstancesBMCeph.yaml b/de/heat-templates/fragments/SrvInstancesBMCeph.yaml
index 7c88e3d..ad2a702 100644
--- a/de/heat-templates/fragments/SrvInstancesBMCeph.yaml
+++ b/de/heat-templates/fragments/SrvInstancesBMCeph.yaml
@@ -89,7 +89,7 @@
group: ungrouped
config:
str_replace:
- template: { get_file: ../scripts/instance_boot.sh }
+ template: { get_file: ../scripts/launch.sh }
params:
$node_type: { get_param: node_type }
$kubernetes_installer: { get_param: kubernetes_installer }
diff --git a/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml b/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
index f2f4cd2..0c92f7a 100644
--- a/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
+++ b/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
@@ -110,7 +110,7 @@
group: ungrouped
config:
str_replace:
- template: { get_file: ../scripts/instance_boot.sh }
+ template: { get_file: ../scripts/launch.sh }
params:
$node_type: { get_param: node_type }
$kubernetes_installer: { get_param: kubernetes_installer }
diff --git a/de/heat-templates/fragments/SrvInstancesVM.yaml b/de/heat-templates/fragments/SrvInstancesVM.yaml
index cb37946..374ec92 100644
--- a/de/heat-templates/fragments/SrvInstancesVM.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVM.yaml
@@ -82,6 +82,9 @@
kubectl_version:
type: string
default: 1.18.8
+ devops_utils_refspec:
+ type: string
+ default: 'master'
resources:
@@ -91,7 +94,7 @@
group: ungrouped
config:
str_replace:
- template: { get_file: ../scripts/instance_boot.sh }
+ template: { get_file: ../scripts/launch.sh }
params:
$node_type: { get_param: node_type }
$kubernetes_installer: { get_param: kubernetes_installer }
@@ -113,6 +116,7 @@
$single_node: { get_param: single_node }
$secure_overlay_enabled: { get_param: secure_overlay_enabled }
$kubectl_version: { get_param: kubectl_version }
+ $devops_utils_refspec: { get_param: devops_utils_refspec }
inject_files:
type: "OS::Heat::CloudConfig"
diff --git a/de/heat-templates/fragments/SrvInstancesVMCeph.yaml b/de/heat-templates/fragments/SrvInstancesVMCeph.yaml
index 0e3a99d..320b564 100644
--- a/de/heat-templates/fragments/SrvInstancesVMCeph.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVMCeph.yaml
@@ -91,6 +91,9 @@
kubectl_version:
type: string
default: 1.18.8
+ devops_utils_refspec:
+ type: string
+ default: 'master'
resources:
@@ -100,7 +103,7 @@
group: ungrouped
config:
str_replace:
- template: { get_file: ../scripts/instance_boot.sh }
+ template: { get_file: ../scripts/launch.sh }
params:
$node_type: { get_param: node_type }
$kubernetes_installer: { get_param: kubernetes_installer }
@@ -126,6 +129,7 @@
$ironic_baremetal_tunnel_cidr: { get_param: ironic_baremetal_tunnel_cidr }
$ironic_mt_enabled: { get_param: ironic_mt_enabled }
$kubectl_version: { get_param: kubectl_version }
+ $devops_utils_refspec: { get_param: devops_utils_refspec }
inject_files:
type: "OS::Heat::CloudConfig"
diff --git a/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml b/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
index cc0e841..dff89f5 100644
--- a/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
@@ -124,6 +124,9 @@
kubectl_version:
type: string
default: 1.18.8
+ devops_utils_refspec:
+ type: string
+ default: 'master'
resources:
@@ -133,7 +136,7 @@
group: ungrouped
config:
str_replace:
- template: { get_file: ../scripts/instance_boot.sh }
+ template: { get_file: ../scripts/launch.sh }
params:
$node_type: { get_param: node_type }
$kubernetes_installer: { get_param: kubernetes_installer }
@@ -168,6 +171,7 @@
$lvm_loop_device_size: { get_param: lvm_loop_device_size }
$cinder_lvm_loop_device_size: { get_param: cinder_lvm_loop_device_size }
$kubectl_version: { get_param: kubectl_version }
+ $devops_utils_refspec: { get_param: devops_utils_refspec }
inject_files:
type: "OS::Heat::CloudConfig"
diff --git a/de/heat-templates/fragments/multirack/SrvInstancesVM.yaml b/de/heat-templates/fragments/multirack/SrvInstancesVM.yaml
index cdaa49e..dc437b2 100644
--- a/de/heat-templates/fragments/multirack/SrvInstancesVM.yaml
+++ b/de/heat-templates/fragments/multirack/SrvInstancesVM.yaml
@@ -67,7 +67,7 @@
group: ungrouped
config:
str_replace:
- template: { get_file: ../../scripts/instance_boot.sh }
+ template: { get_file: ../../scripts/launch.sh }
params:
$node_type: { get_param: node_type }
$kubernetes_installer: { get_param: kubernetes_installer }
diff --git a/de/heat-templates/fragments/multirack/SrvInstancesVMCeph.yaml b/de/heat-templates/fragments/multirack/SrvInstancesVMCeph.yaml
index 5adf1f7..288d03c 100644
--- a/de/heat-templates/fragments/multirack/SrvInstancesVMCeph.yaml
+++ b/de/heat-templates/fragments/multirack/SrvInstancesVMCeph.yaml
@@ -96,7 +96,7 @@
group: ungrouped
config:
str_replace:
- template: { get_file: ../../scripts/instance_boot.sh }
+ template: { get_file: ../../scripts/launch.sh }
params:
$node_type: { get_param: node_type }
$kubernetes_installer: { get_param: kubernetes_installer }
diff --git a/de/heat-templates/fragments/multirack/SrvInstancesVMRack.yaml b/de/heat-templates/fragments/multirack/SrvInstancesVMRack.yaml
index 9e09613..8efb30a 100644
--- a/de/heat-templates/fragments/multirack/SrvInstancesVMRack.yaml
+++ b/de/heat-templates/fragments/multirack/SrvInstancesVMRack.yaml
@@ -61,7 +61,7 @@
group: ungrouped
config:
str_replace:
- template: { get_file: ../../scripts/instance_boot.sh }
+ template: { get_file: ../../scripts/launch.sh }
params:
$node_type: { get_param: node_type }
$kubernetes_installer: { get_param: kubernetes_installer }