summaryrefslogtreecommitdiffstats
path: root/filter_plugins
diff options
context:
space:
mode:
authorWesley Hearn <wesley.s.hearn@gmail.com>2015-08-12 23:06:34 -0400
committerWesley Hearn <wesley.s.hearn@gmail.com>2015-08-12 23:06:34 -0400
commitcd989f62709db9f858205420869b9a665cc609a1 (patch)
tree436e53b269a8a4ab4f2751a1b16052350a5cc5e6 /filter_plugins
parentd307f715764164c8f543d57486718f95b1987875 (diff)
parent7a12b210856a2abefb2a7d70448975c7f2ce14af (diff)
downloadopenshift-cd989f62709db9f858205420869b9a665cc609a1.tar.gz
openshift-cd989f62709db9f858205420869b9a665cc609a1.tar.bz2
openshift-cd989f62709db9f858205420869b9a665cc609a1.tar.xz
openshift-cd989f62709db9f858205420869b9a665cc609a1.zip
Merge pull request #416 from spinolacastro/fix_labels
Fix node labeling. Issue #305
Diffstat (limited to 'filter_plugins')
-rw-r--r--filter_plugins/oo_filters.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/filter_plugins/oo_filters.py b/filter_plugins/oo_filters.py
index 47033a88e..9c263f0dd 100644
--- a/filter_plugins/oo_filters.py
+++ b/filter_plugins/oo_filters.py
@@ -130,6 +130,16 @@ class FilterModule(object):
rval.append("%s%s%s" % (item['key'], joiner, item['value']))
return rval
+
+ @staticmethod
+ def oo_combine_dict(data, in_joiner='=', out_joiner=' '):
+ '''Take a dict in the form of { 'key': 'value', 'key': 'value' } and
+ arrange them as a string 'key=value key=value'
+ '''
+ if not issubclass(type(data), dict):
+ raise errors.AnsibleFilterError("|failed expects first param is a dict")
+
+ return out_joiner.join([ in_joiner.join([k, v]) for k, v in data.items() ])
@staticmethod
def oo_ami_selector(data, image_name):
@@ -309,6 +319,7 @@ class FilterModule(object):
"oo_ami_selector": self.oo_ami_selector,
"oo_ec2_volume_definition": self.oo_ec2_volume_definition,
"oo_combine_key_value": self.oo_combine_key_value,
+ "oo_combine_dict": self.oo_combine_dict,
"oo_split": self.oo_split,
"oo_filter_list": self.oo_filter_list,
"oo_parse_heat_stack_outputs": self.oo_parse_heat_stack_outputs