diff options
| author |   Linda Wang <wangwulin@huawei.com> | 2018-03-13 01:36:40 +0000 |
|---|---|---|
| committer | Linda Wang <wangwulin@huawei.com> | 2018-03-15 03:50:30 +0000 |
| commit | c9fd7ceab29ff755aa8a9ee1bcb6ab958e5e0420 (patch) | |
| tree | 86910e6c608ab886264e1ff2fa388761b2078116 /functest/opnfv_tests/openstack/rally | |
| parent | 370eee3b9b1b20057191aa614ddfda31f8656e8e (diff) | |
Create 2 images and flavors for tempest tests
Also
1. remove the obsolete function: generate_test_accounts_file
2. Use patch mechanism to get config
Change-Id: I455ac37de71519bcaf9a51e5f1de1b9bc83b9ba6
Signed-off-by: Linda Wang <wangwulin@huawei.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/rally')
| -rw-r--r-- | functest/opnfv_tests/openstack/rally/rally.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py index 1502d5825..5b6a76fe4 100644 --- a/functest/opnfv_tests/openstack/rally/rally.py +++ b/functest/opnfv_tests/openstack/rally/rally.py @@ -53,7 +53,7 @@ class RallyBase(testcase.TestCase): GLANCE_IMAGE_FORMAT = getattr(config.CONF, 'openstack_image_disk_format') GLANCE_IMAGE_USERNAME = getattr(config.CONF, 'openstack_image_username') GLANCE_IMAGE_EXTRA_PROPERTIES = getattr( - config.CONF, 'openstack_extra_properties', {}) + config.CONF, 'image_properties', {}) FLAVOR_NAME = getattr(config.CONF, 'rally_flavor_name') FLAVOR_ALT_NAME = getattr(config.CONF, 'rally_flavor_alt_name') FLAVOR_RAM = 512 |