Merge changes Ib7384772,I94e94c21

[functest.git] / functest / ci / config_functest.yaml

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 3e49d61..7e51ee7 100644 (file)
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -44,6 +44,7 @@ general:
 snaps:
     use_keystone: 'True'
     use_floating_ips: 'True'
+    flavor_extra_specs: {}
     images:
         glance_tests:
             disk_file: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.img
@@ -150,14 +151,6 @@ tempest:
 rally:
     deployment_name: opnfv-rally
     network_name: rally-net
-    # network_type: vlan
-    # physical_network: physnet2
-    # segmentation_id: 2366
-    subnet_name: rally-subnet
-    subnet_cidr: 192.168.140.0/24
-    router_name: rally-router
-    flavor_name: rally-tiny
-    flavor_alt_name: rally-mini
 
 vnf:
     juju_epc:
@@ -172,10 +165,8 @@ vnf:
         tenant_name: cloudify_ims
         tenant_description: vIMS
         config: cloudify_ims.yaml
-    cloudify_ims_perf:
-        tenant_name: cloudify_ims_perf
-        tenant_description: vIMS
-        config: cloudify_ims_perf.yaml
+    heat_ims:
+        config: heat_ims.yaml
     orchestra_openims:
         tenant_name: orchestra_openims
         tenant_description: OpenIMS deployed with Open Baton