From: Nikolas Hermanns <nikolas.hermanns@ericsson.com>
Date: Tue, 14 Mar 2017 08:31:31 +0000 (+0000)
Subject: Merge "Fix typo in quagga script and call to glance" into stable/danube
X-Git-Tag: danube.2.RC1~26
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=08003569c5c84b4676c4306919f1937f96000418;p=sdnvpn.git

Merge "Fix typo in quagga script and call to glance" into stable/danube
---

08003569c5c84b4676c4306919f1937f96000418
diff --cc sdnvpn/artifacts/quagga_setup.sh
index e20c193,3933b31..8a90198
--- a/sdnvpn/artifacts/quagga_setup.sh
+++ b/sdnvpn/artifacts/quagga_setup.sh
@@@ -20,10 -15,10 +20,10 @@@ ip addr add $OWN_IP/$EXT_NET_MASK dev e
  
  ZEBRA_CONFIG_LOCATION="/etc/quagga/zebra.conf"
  DAEMONS_FILE_LOCATION="/etc/quagga/daemons"
 -BGPD_CONFIG_LOCATION="/etc/quagga/daemons"
 +BGPD_CONFIG_LOCATION="/etc/quagga/bgpd.conf"
  BGPD_LOG_FILE="/var/log/bgpd.log"
  
- DEBIAN_FONTEND=noninteractive apt-get update
+ DEBIAN_FRONTEND=noninteractive apt-get update
  DEBIAN_FRONTEND=noninteractive apt-get install quagga -y
  
  touch $BGPD_LOG_FILE