X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fci%2Fconfig_functest.yaml;h=d7a162f73e61b43b2f76894238432b96490d2f04;hb=2a0702ea914a574ffa7c6d6f83a5c606e24ebd0a;hp=557a67b94423f7ad0360d7ffadc1d701a71ac821;hpb=2e7f66734394dc5e749ef9ac95e46a8ded9fb2c9;p=functest.git

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 557a67b94..d7a162f73 100644
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -11,6 +11,7 @@ general:
         functest_conf: /home/opnfv/functest/conf
         functest_data: /home/opnfv/functest/data
         ims_data: /home/opnfv/functest/data/ims/
+        rally_data: /home/opnfv/functest/data/rally
         refstack_data: /home/opnfv/functest/data/refstack
         router_data: /home/opnfv/functest/data/router/opnfv-vnf-data
         functest_images: /home/opnfv/functest/images
@@ -41,47 +42,6 @@ general:
         neutron_private_subnet_gateway: 192.168.120.254
         neutron_router_name: functest-router
 
-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
-        cirros:
-            disk_file: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.img
-        ubuntu:
-            disk_file:
-                /home/opnfv/functest/images/ubuntu-14.04-server-cloudimg-amd64-disk1.img
-        centos:
-            disk_file:
-                /home/opnfv/functest/images/CentOS-7-x86_64-GenericCloud.qcow2
-#   netconf_override:
-#       network_type: vlan
-#       physical_network: physnet2
-#       segmentation_id: 2366
-
-# All of these values are optional and will override the values retrieved
-# by the RC file
-#    os_creds_override:
-#      username: {user}
-#      password: {password}
-#      auth_url: {auth_url}
-#      project_name: {project_name}
-#      identity_api_version: {2|3}
-#      network_api_version: {2}
-#      compute_api_version: {2}
-#      image_api_version: {1|2}
-#      user_domain_id: {user_domain_id}
-#      project_domain_id: {projects_domain_id}
-#      interface: {interface}
-#      cacert: {True|False}
-#      proxy_settings:
-#        host: {proxy_host}
-#        port: {proxy_port}
-#        ssh_proxy_cmd: {OpenSSH -o ProxyCommand value}
-
-
 vping:
     ping_timeout: 200
     vm_flavor: m1.tiny   # adapt to your environment
@@ -131,26 +91,9 @@ odl_sfc:
 
 tempest:
     verifier_name: opnfv-tempest
-    identity:
-        tenant_name: tempest
-        tenant_description: Tenant for Tempest test suite
-        user_name: tempest
-        user_password: Tempest123!
-    validation:
-        ssh_timeout: 130
-    object_storage:
-        operator_role: SwiftOperator
-    # network_type: vlan
-    # physical_network: physnet2
-    # segmentation_id: 2366
-    private_net_name: tempest-net
-    private_subnet_name: tempest-subnet
-    private_subnet_cidr: 192.168.150.0/24
-    router_name: tempest-router
 
 rally:
     deployment_name: opnfv-rally
-    network_name: rally-net
 
 vnf:
     juju_epc: