浏览代码

Default an empty list for etcd_to_config if not there

Also add filter names of filters that failed me for to their error
messages so you can figure out which filter threw an exception when
you're debugging log files.
Tim Bielawa 7 年之前
父节点
当前提交
58b3a05fbe
共有 2 个文件被更改,包括 5 次插入5 次删除
  1. 4 4
      filter_plugins/oo_filters.py
  2. 1 1
      playbooks/common/openshift-master/config.yml

+ 4 - 4
filter_plugins/oo_filters.py

@@ -194,10 +194,10 @@ def oo_select_keys_from_list(data, keys):
     """
     """
 
 
     if not isinstance(data, list):
     if not isinstance(data, list):
-        raise errors.AnsibleFilterError("|failed expects to filter on a list")
+        raise errors.AnsibleFilterError("|oo_select_keys_from_list failed expects to filter on a list")
 
 
     if not isinstance(keys, list):
     if not isinstance(keys, list):
-        raise errors.AnsibleFilterError("|failed expects first param is a list")
+        raise errors.AnsibleFilterError("|oo_select_keys_from_list failed expects first param is a list")
 
 
     # Gather up the values for the list of keys passed in
     # Gather up the values for the list of keys passed in
     retval = [oo_select_keys(item, keys) for item in data]
     retval = [oo_select_keys(item, keys) for item in data]
@@ -213,10 +213,10 @@ def oo_select_keys(data, keys):
     """
     """
 
 
     if not isinstance(data, Mapping):
     if not isinstance(data, Mapping):
-        raise errors.AnsibleFilterError("|failed expects to filter on a dict or object")
+        raise errors.AnsibleFilterError("|oo_select_keys failed expects to filter on a dict or object")
 
 
     if not isinstance(keys, list):
     if not isinstance(keys, list):
-        raise errors.AnsibleFilterError("|failed expects first param is a list")
+        raise errors.AnsibleFilterError("|oo_select_keys failed expects first param is a list")
 
 
     # Gather up the values for the list of keys passed in
     # Gather up the values for the list of keys passed in
     retval = [data[key] for key in keys if key in data]
     retval = [data[key] for key in keys if key in data]

+ 1 - 1
playbooks/common/openshift-master/config.yml

@@ -127,7 +127,7 @@
                                                     | union(groups['oo_etcd_to_config'] | default([])))
                                                     | union(groups['oo_etcd_to_config'] | default([])))
                                                 | oo_collect('openshift.common.hostname') | default([]) | join (',')
                                                 | oo_collect('openshift.common.hostname') | default([]) | join (',')
                                                 }}"
                                                 }}"
-    openshift_no_proxy_etcd_host_ips: "{{ hostvars | oo_select_keys(groups['oo_etcd_to_config'])
+    openshift_no_proxy_etcd_host_ips: "{{ hostvars | oo_select_keys(groups['oo_etcd_to_config'] | default([]))
                                                 | oo_collect('openshift.common.ip') | default([]) | join(',')
                                                 | oo_collect('openshift.common.ip') | default([]) | join(',')
                                                 }}"
                                                 }}"
   roles:
   roles: