diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2017-12-14 07:54:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-14 07:54:55 +0000 |
| commit | 3710899e8909f2800a872561a1d2ffa7732dd517 (patch) | |
| tree | ff5221d18747b79935146488f0c29a3c5ba36c2e /yardstick | |
| parent | edc45f4034d3f5b3d225b66da3839d4fe60f461f (diff) | |
| parent | 3e93bb8ff3ef9ff454d6be13295198dbeac75df7 (diff) | |
Merge "Ansible: fix lowercasing issue with ConfigParser"
Diffstat (limited to 'yardstick')
| -rw-r--r-- | yardstick/common/ansible_common.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/yardstick/common/ansible_common.py b/yardstick/common/ansible_common.py index 0cafa9708..9a4426bf9 100644 --- a/yardstick/common/ansible_common.py +++ b/yardstick/common/ansible_common.py @@ -298,8 +298,9 @@ class AnsibleNode(MutableMapping): def gen_inventory_line(self): inventory_params = self.get_inventory_params() # use format to convert ints + # sort to ensure consistent key value ordering formatted_args = (u"{}={}".format(*entry) for entry in - inventory_params.items()) + sorted(inventory_params.items())) line = u" ".join(chain([self['name']], formatted_args)) return line @@ -472,6 +473,8 @@ class AnsibleCommon(object): prefix = '_'.join([self.prefix, prefix, 'inventory']) ini_temp_file = IniMapTemporaryFile(directory=directory, prefix=prefix) inventory_config = ConfigParser.ConfigParser(allow_no_value=True) + # disable default lowercasing + inventory_config.optionxform = str return ini_temp_file.make_context(self.inventory_dict, write_func, descriptor='inventory') |