summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomanos Skiadas <rski@intracom-telecom.com>2017-03-10 10:39:51 +0200
committerNikolas Hermanns <nikolas.hermanns@ericsson.com>2017-03-14 08:30:47 +0000
commitbeeb817d21c18f3e2ddbd5d880d1cc743c7d6127 (patch)
tree381062e24d38cd2e80141ac0017a5043fe9d32e6
parent816b2ea7ac600885b777e906bfe944f16e5fd8db (diff)
Fix typo in quagga script and call to glance
Change-Id: I80ce2f3b442bc7862486368822c8fe2cd13a0f1b JIRA: SDNVPN-114 Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com> (cherry picked from commit 7b1e45de5574cd35013910e746756d0718a45ceb)
-rw-r--r--sdnvpn/artifacts/quagga_setup.sh2
-rw-r--r--sdnvpn/test/functest/testcase_3.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/sdnvpn/artifacts/quagga_setup.sh b/sdnvpn/artifacts/quagga_setup.sh
index 6da50e1..3933b31 100644
--- a/sdnvpn/artifacts/quagga_setup.sh
+++ b/sdnvpn/artifacts/quagga_setup.sh
@@ -18,7 +18,7 @@ DAEMONS_FILE_LOCATION="/etc/quagga/daemons"
BGPD_CONFIG_LOCATION="/etc/quagga/daemons"
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 --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py
index 8bbc738..842d9f1 100644
--- a/sdnvpn/test/functest/testcase_3.py
+++ b/sdnvpn/test/functest/testcase_3.py
@@ -173,7 +173,7 @@ def main():
glance_client,
COMMON_CONFIG.ubuntu_image_name,
COMMON_CONFIG.ubuntu_image_path,
- disk="qcow2",
+ disk="raw",
container="bare",
public="public")
@@ -229,7 +229,7 @@ def main():
COMMON_CONFIG.image_path,
disk=COMMON_CONFIG.image_format,
container="bare",
- public=True)
+ public="public")
instance = test_utils.create_instance(
nova_client,