aboutsummaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
Diffstat (limited to 'deployment')
-rw-r--r--deployment/heat/onap-oom/env/tlab/onap-oom.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/onap-oom-light.env2
-rw-r--r--deployment/heat/onap-oom/env/windriver/onap-oom.env2
-rw-r--r--deployment/heat/onap-oom/k8s_vm_entrypoint.sh4
-rw-r--r--deployment/heat/onap-oom/rancher_vm_entrypoint.sh5
5 files changed, 10 insertions, 5 deletions
diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env
index a77da7329..33ba83dda 100644
--- a/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@ -2,7 +2,7 @@ parameters:
ubuntu_1604_image: "Ubuntu 16.04 LTS Generic"
- apt_proxy: 192.168.31.204:3142
+ apt_proxy: 192.168.31.204:8000
docker_proxy: 192.168.31.204:5000
rancher_vm_flavor: m5.xlarge
diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom-light.env b/deployment/heat/onap-oom/env/windriver/onap-oom-light.env
index 5d18a4d34..c512c5111 100644
--- a/deployment/heat/onap-oom/env/windriver/onap-oom-light.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom-light.env
@@ -2,7 +2,7 @@ parameters:
ubuntu_1604_image: ubuntu-16-04-cloud-amd64
- apt_proxy: 10.12.5.2:3142
+ apt_proxy: 10.12.5.2:8000
docker_proxy: 10.12.5.2:5000
rancher_vm_flavor: m1.large
diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index 284bcc28e..2f57db646 100644
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -2,7 +2,7 @@ parameters:
ubuntu_1604_image: ubuntu-16-04-cloud-amd64
- apt_proxy: 10.12.5.2:3142
+ apt_proxy: 10.12.5.2:8000
docker_proxy: 10.12.5.2:5000
rancher_vm_flavor: m2.xlarge
diff --git a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh
index 438529558..6311dfbff 100644
--- a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh
+++ b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh
@@ -40,10 +40,12 @@ echo "__rancher_private_ip_addr__:/dockerdata-nfs /dockerdata-nfs nfs noauto,noa
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 f90957a56..18951d937 100644
--- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
+++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
@@ -62,9 +62,12 @@ Acquire::https::Proxy "DIRECT";
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