From 9e47ddb9739bb3e6b2ca91615c71bcd94c954172 Mon Sep 17 00:00:00 2001 From: Nikolas Hermanns Date: Wed, 3 May 2017 16:25:53 +0200 Subject: Remove dependence inet A new ubuntu image with quagga included was uploaded to artifacts.opnfv.org/sdnvpn/ ubuntu-16.04-server-cloudimg-amd64-disk1.img Change-Id: I7e48ebbc2b00b7e771f43b26303acc66c2c48457 Signed-off-by: Nikolas Hermanns --- sdnvpn/artifacts/quagga_setup.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'sdnvpn/artifacts/quagga_setup.sh') diff --git a/sdnvpn/artifacts/quagga_setup.sh b/sdnvpn/artifacts/quagga_setup.sh index c2d27bc..a8fe9f6 100644 --- a/sdnvpn/artifacts/quagga_setup.sh +++ b/sdnvpn/artifacts/quagga_setup.sh @@ -5,11 +5,6 @@ set -xe # change the password because this script is run on a passwordless cloud-image echo 'ubuntu:opnfv' | chpasswd -# dns fix - -echo "nameserver 8.8.8.8" > /etc/resolvconf/resolv.conf.d/head -resolvconf -u - # Wait for a floating IP # as a workaround to NAT breakage sleep 20 @@ -47,8 +42,12 @@ DAEMONS_FILE_LOCATION="/etc/quagga/daemons" BGPD_CONFIG_LOCATION="/etc/quagga/bgpd.conf" BGPD_LOG_FILE="/var/log/bgpd.log" -DEBIAN_FRONTEND=noninteractive apt-get update -DEBIAN_FRONTEND=noninteractive apt-get install quagga -y +# Quagga is already installed to run as well in setups without inet +# dns fix +# echo "nameserver 8.8.8.8" > /etc/resolvconf/resolv.conf.d/head +# resolvconf -u +# DEBIAN_FRONTEND=noninteractive apt-get update +# DEBIAN_FRONTEND=noninteractive apt-get install quagga -y touch $BGPD_LOG_FILE chown quagga:quagga $BGPD_LOG_FILE -- cgit 1.2.3-korg