Remove obsolete public network definitions

[functest.git] / testcases / config_functest.yaml

diff --git a/testcases/config_functest.yaml b/testcases/config_functest.yaml
index 6d2f4c1..2f034f9 100644 (file)
--- a/testcases/config_functest.yaml
+++ b/testcases/config_functest.yaml
@@ -49,12 +49,6 @@ general:
         image_file_name:  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
-        neutron_public_subnet_start: 172.16.9.130
-        neutron_public_subnet_end: 172.16.9.254
         #Private network for functest. Will be created by config_functest.py
         neutron_private_net_name: functest-net
         neutron_private_subnet_name: functest-subnet
@@ -83,7 +77,7 @@ tempest:
         user_name: tempest
         user_password: tempest
     input-scenario:
-        ssh_user_regex: [["^.*[Cc]irros.*$", "cirros"], ["^.*[Tt]est[VvMm].*$", "cirros"], ["^.*rally_verify.*$", "cirros"]]
+        ssh_user_regex: '[["^.*[Cc]irros.*$", "cirros"], ["^.*[Tt]est[VvMm].*$", "cirros"], ["^.*rally_verify.*$", "cirros"]]'
 
 rally:
     deployment_name: opnfv-rally
@@ -178,7 +172,7 @@ test_exec_priority:
     4: odl
     5: onos
     6: ovno
-    #7: doctor
+    7: doctor
     8: promise
     9: odl-vpnservice
     10: bgpvpn
@@ -233,7 +227,7 @@ test_exec_priority:
 #######################################################################
 test-dependencies:
     doctor:
-        installer: '(apex)|(fuel)'
+        installer: 'apex'
     functest:
         vims:
             scenario: '(ocl)|(odl)|(nosdn)'