aboutsummaryrefslogtreecommitdiffstats
path: root/functest/utils
diff options
context:
space:
mode:
authorDelia Popescu <delia.popescu@enea.com>2018-09-06 18:37:11 +0300
committerCedric Ollivier <cedric.ollivier@orange.com>2018-10-08 15:29:36 +0000
commit41a4ee5170d6f46042d0ba365d78a21be6ec5b1b (patch)
tree049cb5181ed2a522432e2128020f8aed8476021b /functest/utils
parentd94fe7b60045debd8b6a1038ffda3c265d0c22a6 (diff)
Use environment variable for image properties
Use IMG_PROP environment variable to read extra image properties. Set image_extra_properties for scsi volume types without file patch, but using IMG_PROP env variable IMG_PROP is defined through releng. Image extra_properties will continue to get updates from functest config file With this change, remove unnecessary parameters from arm patch Related to:https://gerrit.opnfv.org/gerrit/#/c/63203/ JIRA:ARMBAND-402 Change-Id: I64139240751b1e109bbe24ba32f487ccd98b9a92 Signed-off-by: Delia Popescu <delia.popescu@enea.com> (cherry picked from commit d7c5419ed8d3dcdb59f4f5f254de0c7bb7a0aec6)
Diffstat (limited to 'functest/utils')
-rw-r--r--functest/utils/env.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/functest/utils/env.py b/functest/utils/env.py
index 3d8154ca9..26efbb196 100644
--- a/functest/utils/env.py
+++ b/functest/utils/env.py
@@ -32,6 +32,7 @@ INPUTS = {
'ENERGY_RECORDER_API_USER': env.INPUTS['ENERGY_RECORDER_API_USER'],
'ENERGY_RECORDER_API_PASSWORD': env.INPUTS['ENERGY_RECORDER_API_PASSWORD'],
'VOLUME_DEVICE_NAME': 'vdb',
+ 'IMG_PROP': '',
'NAMESERVER': '8.8.8.8',
'NEW_USER_ROLE': 'Member',
'USE_DYNAMIC_CREDENTIALS': 'True',