From 2c2914ae3fe4e82209ae9a46f68a15c4ad1ede1e Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Wed, 1 Aug 2018 14:13:02 -0700 Subject: [PATCH] Remove unnecessary install of JDK JDK should not be necessary in HEAT VMs since everything should be run in docker containers. Change-Id: Ibf5038490595bdf3a02699eeb824eb4b4e569bb1 Issue-ID: INT-605 Signed-off-by: Gary Wu --- boot/aai_install.sh | 4 +--- boot/appc_install.sh | 4 +--- boot/clamp_install.sh | 4 +--- boot/dcae2_install.sh | 6 ++---- boot/dns_install.sh | 4 +--- boot/mr_install.sh | 4 +--- boot/music_install.sh | 4 +--- boot/nbi_install.sh | 2 +- boot/oof_install.sh | 4 +--- boot/openo_install.sh | 4 +--- boot/policy_install.sh | 4 +--- boot/portal_install.sh | 4 +--- boot/sdc_install.sh | 4 +--- boot/sdnc_install.sh | 4 +--- boot/sms_install.sh | 4 +--- boot/so_install.sh | 4 +--- boot/vid_install.sh | 4 +--- 17 files changed, 18 insertions(+), 50 deletions(-) diff --git a/boot/aai_install.sh b/boot/aai_install.sh index 2c981e09..83450e3c 100644 --- a/boot/aai_install.sh +++ b/boot/aai_install.sh @@ -56,10 +56,8 @@ then fi # Download dependencies -echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list -echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list apt-get update -apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make +apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make # Download scripts from Nexus unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip aai_vm_init.sh > /opt/aai_vm_init.sh diff --git a/boot/appc_install.sh b/boot/appc_install.sh index fe4be354..c66b12a6 100644 --- a/boot/appc_install.sh +++ b/boot/appc_install.sh @@ -55,10 +55,8 @@ then fi # Download dependencies -echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list -echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list apt-get update -apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make +apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make # Download scripts from Nexus unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip appc_vm_init.sh > /opt/appc_vm_init.sh diff --git a/boot/clamp_install.sh b/boot/clamp_install.sh index 5063cd62..24e95373 100644 --- a/boot/clamp_install.sh +++ b/boot/clamp_install.sh @@ -55,10 +55,8 @@ then fi # Download dependencies -echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list -echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list apt-get update -apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make +apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make # Download scripts from Nexus unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip clamp_vm_init.sh > /opt/clamp_vm_init.sh diff --git a/boot/dcae2_install.sh b/boot/dcae2_install.sh index adf619a5..6446efa5 100755 --- a/boot/dcae2_install.sh +++ b/boot/dcae2_install.sh @@ -46,11 +46,9 @@ then fi # Download dependencies -#echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list -#echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list apt-get update -#apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget make openjdk-8-jdk git ntp ntpdate python python-pip -apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget git ntp ntpdate python python-pip +#apt-get install -y apt-transport-https ca-certificates wget make git ntp ntpdate python python-pip +apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate python python-pip # Download scripts from Nexus unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip dcae2_vm_init.sh > /opt/dcae2_vm_init.sh diff --git a/boot/dns_install.sh b/boot/dns_install.sh index fcb2c445..55b24958 100644 --- a/boot/dns_install.sh +++ b/boot/dns_install.sh @@ -60,10 +60,8 @@ then fi # Download dependencies -echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list -echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list apt-get update -apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk bind9 bind9utils bind9-doc ntp ntpdate make +apt-get install -y apt-transport-https ca-certificates wget bind9 bind9utils bind9-doc ntp ntpdate make # Download script mkdir /etc/bind/zones diff --git a/boot/mr_install.sh b/boot/mr_install.sh index d11becfb..152e67f8 100644 --- a/boot/mr_install.sh +++ b/boot/mr_install.sh @@ -55,10 +55,8 @@ then fi # Download dependencies -echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list -echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list apt-get update -apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget make openjdk-8-jdk git ntp ntpdate +apt-get install -y apt-transport-https ca-certificates wget make git ntp ntpdate # Download scripts from Nexus # a) scripts for message router (mr) diff --git a/boot/music_install.sh b/boot/music_install.sh index 5149214f..f01e3551 100644 --- a/boot/music_install.sh +++ b/boot/music_install.sh @@ -55,10 +55,8 @@ then fi # Download dependencies -echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list -echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list apt-get update -apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make +apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make # Download scripts from Nexus unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip music_vm_init.sh > /opt/music_vm_init.sh diff --git a/boot/nbi_install.sh b/boot/nbi_install.sh index 5af9332d..e05b1115 100644 --- a/boot/nbi_install.sh +++ b/boot/nbi_install.sh @@ -55,7 +55,7 @@ then fi apt-get update -apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates curl git ntp ntpdate make software-properties-common +apt-get install -y apt-transport-https ca-certificates curl git ntp ntpdate make software-properties-common # Download scripts from Nexus unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip nbi_vm_init.sh > /opt/nbi_vm_init.sh diff --git a/boot/oof_install.sh b/boot/oof_install.sh index 645b29c1..338677f2 100644 --- a/boot/oof_install.sh +++ b/boot/oof_install.sh @@ -55,10 +55,8 @@ then fi # Download dependencies -echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list -echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list apt-get update -apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make +apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make # Download scripts from Nexus unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip oof_vm_init.sh > /opt/oof_vm_init.sh diff --git a/boot/openo_install.sh b/boot/openo_install.sh index 7dd1c0c1..80c77160 100644 --- a/boot/openo_install.sh +++ b/boot/openo_install.sh @@ -55,10 +55,8 @@ then fi # Download dependencies -echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list -echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list apt-get update -apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git unzip mysql-client-core-5.6 ntp ntpdate make +apt-get install -y apt-transport-https ca-certificates wget git unzip mysql-client-core-5.6 ntp ntpdate make # Download scripts from Nexus unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip vnfsdk_vm_init.sh > /opt/vnfsdk_vm_init.sh diff --git a/boot/policy_install.sh b/boot/policy_install.sh index 0ba20829..cd50487e 100644 --- a/boot/policy_install.sh +++ b/boot/policy_install.sh @@ -55,10 +55,8 @@ then fi # Download dependencies -echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list -echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list apt-get update -apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make +apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make # Download scripts from Nexus unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip policy_vm_init.sh > /opt/policy_vm_init.sh diff --git a/boot/portal_install.sh b/boot/portal_install.sh index b8d7f1cd..af96e5e4 100644 --- a/boot/portal_install.sh +++ b/boot/portal_install.sh @@ -55,10 +55,8 @@ then fi # Download dependencies -echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list -echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list apt-get update -apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git unzip mysql-client-core-5.6 ntp ntpdate make +apt-get install -y apt-transport-https ca-certificates wget git unzip mysql-client-core-5.6 ntp ntpdate make # Download scripts from Nexus unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip portal_vm_init.sh > /opt/portal_vm_init.sh diff --git a/boot/sdc_install.sh b/boot/sdc_install.sh index 3efcf1fc..fd0ae900 100644 --- a/boot/sdc_install.sh +++ b/boot/sdc_install.sh @@ -55,10 +55,8 @@ then fi # Download dependencies -echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list -echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list apt-get update -apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make +apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make # Download scripts from Nexus unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip sdc_vm_init.sh > /opt/sdc_vm_init.sh diff --git a/boot/sdnc_install.sh b/boot/sdnc_install.sh index e767952c..e7333cd7 100644 --- a/boot/sdnc_install.sh +++ b/boot/sdnc_install.sh @@ -55,10 +55,8 @@ then fi # Download dependencies -echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list -echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list apt-get update -apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make jq +apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make jq # Download scripts from Nexus unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip sdnc_vm_init.sh > /opt/sdnc_vm_init.sh diff --git a/boot/sms_install.sh b/boot/sms_install.sh index b85ea52b..9bcf19f2 100644 --- a/boot/sms_install.sh +++ b/boot/sms_install.sh @@ -55,10 +55,8 @@ then fi # Download dependencies -echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list -echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list apt-get update -apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make +apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make # Download scripts from Nexus unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip sms_vm_init.sh > /opt/sms_vm_init.sh diff --git a/boot/so_install.sh b/boot/so_install.sh index f346cbf5..f3700dc0 100644 --- a/boot/so_install.sh +++ b/boot/so_install.sh @@ -56,10 +56,8 @@ then fi # Download dependencies -echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list -echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list apt-get update -apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make +apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make # Download scripts from Nexus unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip so_vm_init.sh > /opt/so_vm_init.sh diff --git a/boot/vid_install.sh b/boot/vid_install.sh index 6848c56d..7da62238 100644 --- a/boot/vid_install.sh +++ b/boot/vid_install.sh @@ -55,10 +55,8 @@ then fi # Download dependencies -echo "deb http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list -echo "deb-src http://ppa.launchpad.net/openjdk-r/ppa/ubuntu $(lsb_release -c -s) main" >> /etc/apt/sources.list.d/java.list apt-get update -apt-get install --allow-unauthenticated -y apt-transport-https ca-certificates wget openjdk-8-jdk git ntp ntpdate make +apt-get install -y apt-transport-https ca-certificates wget git ntp ntpdate make # Download scripts from Nexus unzip -p -j /opt/boot-$ARTIFACTS_VERSION.zip vid_vm_init.sh > /opt/vid_vm_init.sh -- 2.16.6