Read the env file only if exists

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

diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index 8f9bd0d..be7a2db 100644 (file)
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -3,14 +3,9 @@ general:
     dir:
         home: /home/opnfv
         repos: /home/opnfv/repos
-        dir_repo_rally: /home/opnfv/repos/rally
         repo_tempest: /src/tempest
-        dir_repo_releng: /home/opnfv/repos/releng
         repo_vims_test: /src/vims-test
-        repo_barometer: /home/opnfv/repos/barometer
         repo_odl_test: /src/odl_test
-        repo_fds: /src/fds
-        repo_securityscan: /home/opnfv/repos/securityscanning
         functest: /home/opnfv/functest
         results: /home/opnfv/functest/results
         functest_conf: /home/opnfv/functest/conf
@@ -20,19 +15,18 @@ general:
         functest_images: /home/opnfv/functest/images
         rally_inst: /root/.rally
 
-    openstack:
-        creds: /home/opnfv/functest/conf/openstack.creds
-        snapshot_file: /home/opnfv/functest/conf/openstack_snapshot.yaml
+    env_file: /home/opnfv/functest/conf/env_file
 
-        image_name: Cirros-0.3.5
-        image_name_alt: Cirros-0.3.5-1
-        image_file_name: cirros-0.3.5-x86_64-disk.img
+    openstack:
+        image_name: Cirros-0.4.0
+        image_name_alt: Cirros-0.4.0-1
+        image_file_name: cirros-0.4.0-x86_64-disk.img
         image_url:
-            http://download.cirros-cloud.net/0.3.5/cirros-0.3.5-x86_64-disk.img
+            http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img
         image_user: cirros
         image_disk_format: qcow2
         image_username: cirros
-        image_password: cubswin:)
+        image_password: gocubsgo
 
         flavor_name: opnfv_flavor
         flavor_name_alt: opnfv_flavor_1
@@ -54,15 +48,20 @@ snaps:
     use_floating_ips: 'True'
     images:
         glance_tests:
-            disk_file: /home/opnfv/functest/images/cirros-0.3.5-x86_64-disk.img
+            disk_file: /home/opnfv/functest/images/cirros-0.4.0-x86_64-disk.img
         cirros:
-            disk_file: /home/opnfv/functest/images/cirros-0.3.5-x86_64-disk.img
+            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:
@@ -123,6 +122,9 @@ tempest:
         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
@@ -133,6 +135,9 @@ 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
@@ -141,9 +146,13 @@ rally:
 
 vnf:
     juju_epc:
-        tenant_name: epc
+        config: juju_epc.yaml
         tenant_description: OAI EPC deployed with Juju
-        tenant_images: {}
+        tenant_name: abotepc
+        private_net_name: abot-net
+        private_subnet_cidr: 172.16.0.0/24
+        private_subnet_name: abot-subnet
+        external_router: abot-router
     cloudify_ims:
         tenant_name: cloudify_ims
         tenant_description: vIMS
@@ -175,14 +184,3 @@ example:
     router_name: example-router
     sg_name: example-sg
     sg_desc: Example Security group
-
-results:
-    # you can also set a file (e.g. /home/opnfv/functest/results/dump.txt)
-    # to dump results
-    # test_db_url: file:///home/opnfv/functest/results/dump.txt
-    test_db_url: http://testresults.opnfv.org/test/api/v1/results
-
-energy_recorder:
-    api_url: http://energy.opnfv.fr/resources
-    api_user: ""
-    api_password: ""