Pre-cache images when using TP ucp image
Related-Prod: PRODX-7035
Change-Id: I8f682efd4c39156f6db4b6299f3a48663da26423
diff --git a/de/heat-templates/fragments/SrvInstancesBM.yaml b/de/heat-templates/fragments/SrvInstancesBM.yaml
index 3041de1..14876f5 100644
--- a/de/heat-templates/fragments/SrvInstancesBM.yaml
+++ b/de/heat-templates/fragments/SrvInstancesBM.yaml
@@ -48,7 +48,6 @@
type: string
docker_ucp_image:
type: string
- default: 'docker/ucp:3.2.4'
hardware_metadata:
description: The content of lab metadata.
default: ''
@@ -69,13 +68,13 @@
$docker_ee_url: { get_param: docker_ee_url }
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
+ $docker_ucp_image: { get_param: docker_ucp_image }
$node_metadata: { get_param: metadata }
$control_network_cidr: { get_param: control_network_cidr }
$private_floating_interface: { get_param: private_floating_interface }
$private_floating_network_cidr: { get_param: private_floating_network_cidr }
$private_floating_interface_ip: { get_attr: [private_floating_server_port, fixed_ips, 0, ip_address] }
$functions_override: { get_param: functions_override }
- $docker_ucp_image: { get_param: docker_ucp_image }
inject_files:
type: "OS::Heat::CloudConfig"
diff --git a/de/heat-templates/fragments/SrvInstancesBMCeph.yaml b/de/heat-templates/fragments/SrvInstancesBMCeph.yaml
index 1512f16..e96a0e3 100644
--- a/de/heat-templates/fragments/SrvInstancesBMCeph.yaml
+++ b/de/heat-templates/fragments/SrvInstancesBMCeph.yaml
@@ -53,6 +53,8 @@
ucp_master_host:
type: string
default: ''
+ docker_ucp_image:
+ type: string
public_net_id:
type: string
default: ''
@@ -79,6 +81,7 @@
$docker_ee_url: { get_param: docker_ee_url }
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
+ $docker_ucp_image: { get_param: docker_ucp_image }
$node_metadata: { get_param: metadata }
$control_network_cidr: { get_param: control_network_cidr }
$private_floating_interface: { get_param: private_floating_interface }
diff --git a/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml b/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
index 438af6e..b03830f 100644
--- a/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
+++ b/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
@@ -67,6 +67,8 @@
ucp_master_host:
type: string
default: ''
+ docker_ucp_image:
+ type: string
public_net_id:
type: string
default: ''
@@ -97,6 +99,7 @@
$docker_ee_url: { get_param: docker_ee_url }
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
+ $docker_ucp_image: { get_param: docker_ucp_image }
$node_metadata: { get_param: metadata }
$control_network_cidr: { get_param: control_network_cidr }
$private_floating_interface: { get_param: private_floating_interface }
diff --git a/de/heat-templates/fragments/SrvInstancesVM.yaml b/de/heat-templates/fragments/SrvInstancesVM.yaml
index fab95cf..6d2bbb9 100644
--- a/de/heat-templates/fragments/SrvInstancesVM.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVM.yaml
@@ -68,6 +68,7 @@
$docker_ee_url: { get_param: docker_ee_url }
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
+ $docker_ucp_image: { get_param: docker_ucp_image }
$node_metadata: { get_param: metadata }
$control_network_cidr: { get_param: control_network_cidr }
$private_floating_interface: { get_param: private_floating_interface }
diff --git a/de/heat-templates/fragments/SrvInstancesVMCeph.yaml b/de/heat-templates/fragments/SrvInstancesVMCeph.yaml
index 7ab4451..a367c7f 100644
--- a/de/heat-templates/fragments/SrvInstancesVMCeph.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVMCeph.yaml
@@ -53,6 +53,8 @@
ucp_master_host:
type: string
default: ''
+ docker_ucp_image:
+ type: string
public_net_id:
type: string
docker_ee_release:
@@ -87,6 +89,7 @@
$docker_ee_url: { get_param: docker_ee_url }
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
+ $docker_ucp_image: { get_param: docker_ucp_image }
$node_metadata: { get_param: metadata }
$control_network_cidr: { get_param: control_network_cidr }
$private_floating_interface: { get_param: private_floating_interface }
diff --git a/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml b/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
index 74587cb..588b0c9 100644
--- a/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
@@ -67,6 +67,8 @@
ucp_master_host:
type: string
default: ''
+ docker_ucp_image:
+ type: string
public_net_id:
type: string
docker_ee_release:
@@ -105,6 +107,7 @@
$docker_ee_url: { get_param: docker_ee_url }
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
+ $docker_ucp_image: { get_param: docker_ucp_image }
$node_metadata: { get_param: metadata }
$control_network_cidr: { get_param: control_network_cidr }
$private_floating_interface: { get_param: private_floating_interface }