Code Review / sdnvpn.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: c5e40bf beeb817)
Merge "Fix typo in quagga script and call to glance" into stable/danube
authorNikolas Hermanns <nikolas.hermanns@ericsson.com>
Tue, 14 Mar 2017 08:31:31 +0000 (08:31 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 14 Mar 2017 08:31:31 +0000 (08:31 +0000)
1  2 
sdnvpn/artifacts/quagga_setup.sh patch | diff1 | diff2 | blob | history
sdnvpn/test/functest/testcase_3.py patch | diff1 | diff2 | blob | history

diff --cc sdnvpn/artifacts/quagga_setup.sh
index e20c193,3933b31..8a90198
--- 1/sdnvpn/artifacts/quagga_setup.sh
--- 2/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
diff --cc sdnvpn/test/functest/testcase_3.py
Simple merge