From: Cedric Ollivier <cedric.ollivier@orange.com>
Date: Sat, 6 Oct 2018 06:20:38 +0000 (+0000)
Subject: Merge "Use environment variable for image properties"
X-Git-Tag: opnfv-9.0.0~162
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6b0fa7ecb5aa0c0dead1d16c2811f5c47347a091;p=functest.git

Merge "Use environment variable for image properties"
---

6b0fa7ecb5aa0c0dead1d16c2811f5c47347a091
diff --cc functest/utils/env.py
index 3d8154ca9,87940ce11..26efbb196
--- a/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'
  }