Fix typo in quagga script and call to glance 97/30397/1
authorRomanos Skiadas <rski@intracom-telecom.com>
Fri, 10 Mar 2017 08:39:51 +0000 (10:39 +0200)
committerNikolas Hermanns <nikolas.hermanns@ericsson.com>
Tue, 14 Mar 2017 08:30:47 +0000 (08:30 +0000)
Change-Id: I80ce2f3b442bc7862486368822c8fe2cd13a0f1b
JIRA: SDNVPN-114
Signed-off-by: Romanos Skiadas <rski@intracom-telecom.com>
(cherry picked from commit 7b1e45de5574cd35013910e746756d0718a45ceb)

sdnvpn/artifacts/quagga_setup.sh
sdnvpn/test/functest/testcase_3.py

index 6da50e1..3933b31 100644 (file)
@@ -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
index 8bbc738..842d9f1 100644 (file)
@@ -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,