summaryrefslogtreecommitdiffstats
path: root/vnfs/vFW
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2017-09-01 14:18:52 -0400
committerMarco Platania <platania@research.att.com>2017-09-01 14:18:52 -0400
commit67760326c0615897c2396e192cdd336c0ed90b41 (patch)
treed69c065c2505a573ac180dae1e72fa2351013d46 /vnfs/vFW
parent009c0af9c3b0089646267c404eb3e94ae94b0f10 (diff)
Add Java repo to all install scripts
- ONAP install - vCPE/vFW/vLB use cases - Use sources.list.d instead of apt-add-repository - Parametrize the OS name Change-Id: I7287fda8c5f3aa4ecd42ff576ebfd3b937bfa549 Issue-ID: INT-129 Signed-off-by: Marco Platania <platania@research.att.com>
Diffstat (limited to 'vnfs/vFW')
-rw-r--r--vnfs/vFW/scripts/v_firewall_install.sh5
-rw-r--r--vnfs/vFW/scripts/v_packetgen_install.sh5
-rw-r--r--vnfs/vFW/scripts/v_sink_install.sh5
3 files changed, 9 insertions, 6 deletions
diff --git a/vnfs/vFW/scripts/v_firewall_install.sh b/vnfs/vFW/scripts/v_firewall_install.sh
index 0a2c8da8..2120b472 100644
--- a/vnfs/vFW/scripts/v_firewall_install.sh
+++ b/vnfs/vFW/scripts/v_firewall_install.sh
@@ -58,9 +58,10 @@ then
fi
# Download required dependencies
-add-apt-repository -y ppa:openjdk-r/ppa
+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 -y make wget openjdk-8-jdk gcc libcurl4-openssl-dev python-pip bridge-utils apt-transport-https ca-certificates
+apt-get install --allow-unauthenticated -y make wget openjdk-8-jdk gcc libcurl4-openssl-dev python-pip bridge-utils apt-transport-https ca-certificates
pip install jsonschema
# Download artifacts for virtual firewall
diff --git a/vnfs/vFW/scripts/v_packetgen_install.sh b/vnfs/vFW/scripts/v_packetgen_install.sh
index 4ec1e4e6..a73fe44c 100644
--- a/vnfs/vFW/scripts/v_packetgen_install.sh
+++ b/vnfs/vFW/scripts/v_packetgen_install.sh
@@ -48,9 +48,10 @@ then
fi
# Download required dependencies
-add-apt-repository -y ppa:openjdk-r/ppa
+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 -y make wget openjdk-8-jdk gcc libcurl4-openssl-dev python-pip bridge-utils apt-transport-https ca-certificates
+apt-get install --allow-unauthenticated -y make wget openjdk-8-jdk gcc libcurl4-openssl-dev python-pip bridge-utils apt-transport-https ca-certificates
pip install jsonschema
# Download code for packet generator
diff --git a/vnfs/vFW/scripts/v_sink_install.sh b/vnfs/vFW/scripts/v_sink_install.sh
index 88c194d0..f01a0abd 100644
--- a/vnfs/vFW/scripts/v_sink_install.sh
+++ b/vnfs/vFW/scripts/v_sink_install.sh
@@ -46,9 +46,10 @@ then
fi
# Download required dependencies
-add-apt-repository -y ppa:openjdk-r/ppa
+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 -y make wget openjdk-8-jdk apt-transport-https ca-certificates darkstat
+apt-get install --allow-unauthenticated -y make wget openjdk-8-jdk apt-transport-https ca-certificates darkstat
# Configure and run Darkstat
sed -i "s/START_DARKSTAT=.*/START_DARKSTAT=yes/g" /etc/darkstat/init.cfg