Drop adding exporid license
Do not add license as it is expired and we need to save userdata length.
Related-Prod: PRODX-7035
Change-Id: I997bf59011a0dbcedef0a0b7d8dc95ee4baf367a
diff --git a/de/heat-templates/fragments/SrvInstancesBM.yaml b/de/heat-templates/fragments/SrvInstancesBM.yaml
index a2ae698..3041de1 100644
--- a/de/heat-templates/fragments/SrvInstancesBM.yaml
+++ b/de/heat-templates/fragments/SrvInstancesBM.yaml
@@ -66,7 +66,6 @@
params:
$node_type: { get_param: node_type }
$wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
- $ucp_license_key: { get_file: ../scripts/license.lic }
$docker_ee_url: { get_param: docker_ee_url }
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
diff --git a/de/heat-templates/fragments/SrvInstancesBMCeph.yaml b/de/heat-templates/fragments/SrvInstancesBMCeph.yaml
index 6d84308..1512f16 100644
--- a/de/heat-templates/fragments/SrvInstancesBMCeph.yaml
+++ b/de/heat-templates/fragments/SrvInstancesBMCeph.yaml
@@ -76,7 +76,6 @@
params:
$node_type: { get_param: node_type }
$wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
- $ucp_license_key: { get_file: ../scripts/license.lic }
$docker_ee_url: { get_param: docker_ee_url }
$docker_ee_release: { get_param: docker_ee_release }
$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 e7b3831..438af6e 100644
--- a/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
+++ b/de/heat-templates/fragments/SrvInstancesBMCephOSD.yaml
@@ -94,7 +94,6 @@
params:
$node_type: { get_param: node_type }
$wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
- $ucp_license_key: { get_file: ../scripts/license.lic }
$docker_ee_url: { get_param: docker_ee_url }
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
diff --git a/de/heat-templates/fragments/SrvInstancesVM.yaml b/de/heat-templates/fragments/SrvInstancesVM.yaml
index 5d0c936..fab95cf 100644
--- a/de/heat-templates/fragments/SrvInstancesVM.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVM.yaml
@@ -65,7 +65,6 @@
params:
$node_type: { get_param: node_type }
$wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
- $ucp_license_key: { get_file: ../scripts/license.lic }
$docker_ee_url: { get_param: docker_ee_url }
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
diff --git a/de/heat-templates/fragments/SrvInstancesVMCeph.yaml b/de/heat-templates/fragments/SrvInstancesVMCeph.yaml
index cdf9069..7ab4451 100644
--- a/de/heat-templates/fragments/SrvInstancesVMCeph.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVMCeph.yaml
@@ -84,7 +84,6 @@
params:
$node_type: { get_param: node_type }
$wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
- $ucp_license_key: { get_file: ../scripts/license.lic }
$docker_ee_url: { get_param: docker_ee_url }
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
diff --git a/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml b/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
index 5a4d94a..74587cb 100644
--- a/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
+++ b/de/heat-templates/fragments/SrvInstancesVMCephOSD.yaml
@@ -102,7 +102,6 @@
params:
$node_type: { get_param: node_type }
$wait_condition_notify: { get_attr: [ wait_handle, curl_cli ] }
- $ucp_license_key: { get_file: ../scripts/license.lic }
$docker_ee_url: { get_param: docker_ee_url }
$docker_ee_release: { get_param: docker_ee_release }
$ucp_master_host: { get_param: ucp_master_host }
diff --git a/de/heat-templates/scripts/instance_boot.sh b/de/heat-templates/scripts/instance_boot.sh
index 859f182..920cedc 100644
--- a/de/heat-templates/scripts/instance_boot.sh
+++ b/de/heat-templates/scripts/instance_boot.sh
@@ -157,13 +157,9 @@
function install_ucp {
local tmpd
tmpd=$(mktemp -d)
- cat <<EOF > ${tmpd}/docker_subscription.lic
-$ucp_license_key
-EOF
function docker_run_retry {
docker container run --rm --name ucp \
-v /var/run/docker.sock:/var/run/docker.sock \
- -v $tmpd/docker_subscription.lic:/config/docker_subscription.lic \
${DOCKER_UCP_IMAGE} install \
--host-address $UCP_IP_ADDRESS \
--admin-username $UCP_USERNAME \