diff options
| author |   Nikolas Hermanns <nikolas.hermanns@ericsson.com> | 2017-03-14 08:31:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-14 08:31:31 +0000 |
| commit | 08003569c5c84b4676c4306919f1937f96000418 (patch) | |
| tree | 855ad205de33620a3439fa9adfa28fdd0dc64fba | |
| parent | c5e40bf74b6726061a7bf6add287c5f65353e4a1 (diff) | |
| parent | beeb817d21c18f3e2ddbd5d880d1cc743c7d6127 (diff) | |
Merge "Fix typo in quagga script and call to glance" into stable/danube
| -rw-r--r-- | sdnvpn/artifacts/quagga_setup.sh | 2 | ||||
| -rw-r--r-- | sdnvpn/test/functest/testcase_3.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sdnvpn/artifacts/quagga_setup.sh b/sdnvpn/artifacts/quagga_setup.sh index e20c193..8a90198 100644 --- a/sdnvpn/artifacts/quagga_setup.sh +++ b/sdnvpn/artifacts/quagga_setup.sh @@ -23,7 +23,7 @@ DAEMONS_FILE_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 --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py index 3682c3e..0253444 100644 --- a/sdnvpn/test/functest/testcase_3.py +++ b/sdnvpn/test/functest/testcase_3.py @@ -167,7 +167,7 @@ def main(): glance_client, COMMON_CONFIG.ubuntu_image_name, COMMON_CONFIG.ubuntu_image_path, - disk="qcow2", + disk="raw", container="bare", public="public") @@ -252,7 +252,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, |