summaryrefslogtreecommitdiffstats
path: root/testcases/functest.yaml
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2015-05-13 07:37:13 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-05-13 07:37:13 +0000
commitfdf922de422e884b8d69102ec9fa4e262be3cd6d (patch)
tree4711ae7996b4e46bff504809656d0fd606993380 /testcases/functest.yaml
parent2fd620f3fc4dede614272a0753c3ec834a219cbc (diff)
parent96177fdd8b068314d6594361e2d274e9c1fcd7e3 (diff)
Merge "vPing.py : changed #cloud-config to inject an sh script functest.yaml : vPing works now with a Cirros image JIRA: FUNCTEST-3"
Diffstat (limited to 'testcases/functest.yaml')
-rw-r--r--testcases/functest.yaml10
1 files changed, 4 insertions, 6 deletions
diff --git a/testcases/functest.yaml b/testcases/functest.yaml
index cee07fcad..6175e6fcb 100644
--- a/testcases/functest.yaml
+++ b/testcases/functest.yaml
@@ -10,12 +10,10 @@ general:
dir_odl: .functest/ODL/
dir_rally_inst: .rally/
openstack:
- image_name: Ubuntu14.04
- image_url: https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-amd64-disk1.img
- image_disk_format: raw
- #Public network. Will be created by config_functest.py
- #It must be reachable from where the tests are ran
- #For Fuel deployment, it exists already and its called net04_ext
+ image_name: functest-img
+ image_url: http://download.cirros-cloud.net/0.3.4/cirros-0.3.4-x86_64-disk.img
+ image_disk_format: qcow2
+ #Public network. Optional
neutron_public_net_name: net04_ext
neutron_public_subnet_name: net04_ext__subnet
neutron_public_subnet_cidr: 172.16.9.0/24