Merge "Fix role processing in Patrole"

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

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 54e8d08..1721530 100644 (file)
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -11,12 +11,11 @@ general:
         functest_conf: /home/opnfv/functest/conf
         functest_data: /home/opnfv/functest/data
         ims_data: /home/opnfv/functest/data/ims/
+        refstack_data: /home/opnfv/functest/data/refstack
         router_data: /home/opnfv/functest/data/router/
         functest_images: /home/opnfv/functest/images
         rally_inst: /root/.rally
 
-    env_file: /home/opnfv/functest/conf/env_file
-
     openstack:
         image_name: Cirros-0.4.0
         image_name_alt: Cirros-0.4.0-1
@@ -130,7 +129,6 @@ tempest:
     private_subnet_cidr: 192.168.150.0/24
     router_name: tempest-router
     use_custom_flavors: 'False'
-    volume_device_name: vdc
 
 rally:
     deployment_name: opnfv-rally
@@ -153,8 +151,6 @@ vnf:
         private_subnet_cidr: 172.16.0.0/24
         private_subnet_name: abot-subnet
         external_router: abot-router
-        dns_nameserver: ['8.8.8.8']
-
     cloudify_ims:
         tenant_name: cloudify_ims
         tenant_description: vIMS
@@ -186,8 +182,3 @@ example:
     router_name: example-router
     sg_name: example-sg
     sg_desc: Example Security group
-
-energy_recorder:
-    api_url: http://energy.opnfv.fr/resources
-    api_user: ""
-    api_password: ""