Improve resilience against intermittent OS errors
Add workaround for intermittent failure for OpenStack
to properly assign default apt mirrors.
Change-Id: Id4191327542d9711ab65117522c4160838a66052
Issue-ID: INT-586
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
diff --git a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh
index 4385295..6311dfb 100644
--- a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh
+++ b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh
@@ -40,10 +40,12 @@
echo "vm.max_map_count=262144" >> /etc/sysctl.conf
sysctl -p
+# workaround for OpenStack intermittent failure to change default apt mirrors
+sed -i 's|http://archive.ubuntu.com|http://nova.clouds.archive.ubuntu.com|g' /etc/apt/sources.list
while ! hash jq &> /dev/null; do
apt-get -y update
- apt-get -y install linux-image-extra-$(uname -r) jq nfs-common
+ apt-get -y install apt-transport-https ca-certificates curl software-properties-common linux-image-extra-$(uname -r) jq nfs-common
sleep 10
done
diff --git a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
index f90957a..18951d9 100644
--- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
+++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
@@ -62,9 +62,12 @@
EOF
fi
+# workaround for OpenStack intermittent failure to change default apt mirrors
+sed -i 's|http://archive.ubuntu.com|http://nova.clouds.archive.ubuntu.com|g' /etc/apt/sources.list
+
while ! hash jq &> /dev/null; do
apt-get -y update
- apt-get -y install linux-image-extra-$(uname -r) jq make nfs-kernel-server moreutils
+ apt-get -y install linux-image-extra-$(uname -r) apt-transport-https ca-certificates curl software-properties-common jq make nfs-kernel-server moreutils
sleep 10
done