summaryrefslogtreecommitdiffstats
path: root/filter_plugins
diff options
context:
space:
mode:
authorTim Bielawa <timbielawa@gmail.com>2016-10-25 07:02:53 -0700
committerGitHub <noreply@github.com>2016-10-25 07:02:53 -0700
commit70a68bc2f948f7ad527867c702396182bb9323e8 (patch)
treeda0c8ce2084130c89a89dd39974ca7f91321993a /filter_plugins
parent85381f27fb953be2a2edc54991c4ae0556f5cc5f (diff)
parentd0bc360275b94b666ebaeb687d8639bfaad3a85e (diff)
downloadopenshift-70a68bc2f948f7ad527867c702396182bb9323e8.tar.gz
openshift-70a68bc2f948f7ad527867c702396182bb9323e8.tar.bz2
openshift-70a68bc2f948f7ad527867c702396182bb9323e8.tar.xz
openshift-70a68bc2f948f7ad527867c702396182bb9323e8.zip
Merge pull request #2615 from tbielawa/node-labels-fix
Set node-labels in kubeletArguments
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")