Merge "Use environment variable for image properties"

diff --cc functest/opnfv_tests/openstack/tempest/tempest.py
Simple merge

diff --cc functest/utils/env.py
index 3d8154c,87940ce..26efbb1
--- 1/functest/utils/env.py
--- 2/functest/utils/env.py
+++ b/functest/utils/env.py
@@@ -32,10 -32,10 +32,11 @@@ 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'
 +    'USE_DYNAMIC_CREDENTIALS': 'True',
 +    'STORAGE_PROTOCOL': 'iSCSI'
  }