diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-10-06 06:20:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-06 06:20:38 +0000 |
| commit | 6b0fa7ecb5aa0c0dead1d16c2811f5c47347a091 (patch) | |
| tree | 2e215158d478583224b1ee6cd4397faf42e31f39 /functest/opnfv_tests/openstack/tempest | |
| parent | 6efcc4fe7456663445e9fbda54bba3239288ad73 (diff) | |
| parent | d7c5419ed8d3dcdb59f4f5f254de0c7bb7a0aec6 (diff) | |
Merge "Use environment variable for image properties"
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest')
| -rw-r--r-- | functest/opnfv_tests/openstack/tempest/tempest.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py index 73bb443ab..4c5308bdf 100644 --- a/functest/opnfv_tests/openstack/tempest/tempest.py +++ b/functest/opnfv_tests/openstack/tempest/tempest.py @@ -382,6 +382,10 @@ class TempestCommon(singlevm.VmReady2): config.CONF, '{}_image_format'.format(self.case_name), self.image_format)) extra_properties = self.extra_properties.copy() + if env.get('IMG_PROP'): + extra_properties.update(dict((k.strip(), v.strip()) for k, v in + (item.split(': ') for item in + env.get('IMG_PROP').split(',')))) extra_properties.update( getattr(config.CONF, '{}_extra_properties'.format( self.case_name), {})) |