diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-09-16 08:54:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-09-16 08:54:07 +0000 |
| commit | 3cd02a0678e82c107fd7768642a10210b16c825d (patch) | |
| tree | 4be8392276e91650dc00e4a3aee0383527fc284d /ci | |
| parent | 0e497c7deecb469cade667bfa768816ce9b2ab7d (diff) | |
| parent | 0fa8de695dd6b50b7b01131376aefef9c13c21c1 (diff) | |
Merge "Added support for custom images and flavors in tempest"
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/config_functest.yaml | 7 | ||||
| -rw-r--r-- | ci/config_patch.yaml | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml index 12e78d6df..d6497678a 100644 --- a/ci/config_functest.yaml +++ b/ci/config_functest.yaml @@ -39,6 +39,11 @@ general: image_file_name: cirros-0.3.4-x86_64-disk.img image_disk_format: qcow2 + flavor_name: opnfv_flavor + flavor_ram: 512 + flavor_disk: 1 + flavor_vcpus: 1 + # Private network for functest. Will be created by config_functest.py neutron_private_net_name: functest-net neutron_private_subnet_name: functest-subnet @@ -81,6 +86,8 @@ tempest: private_subnet_name: tempest-subnet private_subnet_cidr: 192.168.150.0/24 router_name: tempest-router + use_custom_images: False + use_custom_flavors: False rally: deployment_name: opnfv-rally diff --git a/ci/config_patch.yaml b/ci/config_patch.yaml index 251ab1c4d..dd1aeb54c 100644 --- a/ci/config_patch.yaml +++ b/ci/config_patch.yaml @@ -11,4 +11,7 @@ lxd: fdio: general: flavor_extra_specs: {'hw:mem_page_size':'large'} - image_properties: {'hw_mem_page_size':'large'}
\ No newline at end of file + image_properties: {'hw_mem_page_size':'large'} + tempest: + use_custom_images: True + use_custom_flavors: True
\ No newline at end of file |