summaryrefslogtreecommitdiffstats
path: root/filter_plugins
diff options
context:
space:
mode:
authorTim Bielawa <tbielawa@redhat.com>2016-10-18 06:07:24 -0700
committerTim Bielawa <tbielawa@redhat.com>2016-10-20 08:30:59 -0700
commitd0bc360275b94b666ebaeb687d8639bfaad3a85e (patch)
tree623b5eb6c74a2ae221d149a41d2c440c473887dd /filter_plugins
parentb4d7cf3d6fddbb6335ac22d599cb8a11bd8930a2 (diff)
downloadopenshift-d0bc360275b94b666ebaeb687d8639bfaad3a85e.tar.gz
openshift-d0bc360275b94b666ebaeb687d8639bfaad3a85e.tar.bz2
openshift-d0bc360275b94b666ebaeb687d8639bfaad3a85e.tar.xz
openshift-d0bc360275b94b666ebaeb687d8639bfaad3a85e.zip
Add node-labels to kubeletArguments
* Node labels are parsed from openshift_node_labels if they exist
Diffstat (limited to 'filter_plugins')
-rw-r--r--filter_plugins/oo_filters.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/filter_plugins/oo_filters.py b/filter_plugins/oo_filters.py
index 3541d5471..93fdd5ae4 100644
--- a/filter_plugins/oo_filters.py
+++ b/filter_plugins/oo_filters.py
@@ -234,7 +234,7 @@ class FilterModule(object):
arrange them as a string 'key=value key=value'
"""
if not isinstance(data, dict):
- raise errors.AnsibleFilterError("|failed expects first param is a dict")
+ raise errors.AnsibleFilterError("|failed expects first param is a dict [oo_combine_dict]. Got %s. Type: %s" % (str(data), str(type(data))))
return out_joiner.join([in_joiner.join([k, str(v)]) for k, v in data.items()])
@@ -286,7 +286,7 @@ class FilterModule(object):
}
"""
if not isinstance(data, dict):
- raise errors.AnsibleFilterError("|failed expects first param is a dict")
+ raise errors.AnsibleFilterError("|failed expects first param is a dict [oo_ec2_volume_def]. Got %s. Type: %s" % (str(data), str(type(data))))
if host_type not in ['master', 'node', 'etcd']:
raise errors.AnsibleFilterError("|failed expects etcd, master or node"
" as the host type")