ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #707 from cloudnull/ct_updates 

Update the config_template plugin
pull/715/head
Leseb 2016-04-13 18:52:56 +02:00
parent 107ecc0fa8 b56b224250
commit de0caaecf8
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/actions/_v1_config_template.py
View File

@ -263,7 +263,7 @@ class ActionModule(object):
if isinstance(value, set):
config.set(str(section), str(key), value)
elif isinstance(value, list):
config.set(str(section), str(key), ','.join(value))
config.set(str(section), str(key), ','.join(str(i) for i in value))
else:
config.set(str(section), str(key), str(value))

17
plugins/actions/_v2_config_template.py
View File

@ -303,17 +303,8 @@ class ActionModule(ActionBase):
except (ConfigParser.DuplicateSectionError, ValueError):
pass
for key, value in items.items():
if isinstance(value, list):
items = ','.join(_convert_2_string(value))
else:
items = _convert_2_string(value)
try:
self._option_write(
config,
str(section),
str(key),
items
)
self._option_write(config, section, key, value)
except ConfigParser.NoSectionError as exp:
error_msg = str(exp)
error_msg += (
@ -340,11 +331,11 @@ class ActionModule(ActionBase):
except AttributeError:
pass
if isinstance(value, set):
config.set(section, key, value)
config.set(str(section), str(key), value)
elif isinstance(value, list):
config.set(section, key, ','.join(value))
config.set(str(section), str(key), ','.join(str(i) for i in value))
else:
config.set(section, key, value)
config.set(str(section), str(key), str(value))
def return_config_overrides_json(self, config_overrides, resultant):
"""Returns config json