summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorAbhijeet Kasurde <akasurde@redhat.com>2018-04-11 21:50:35 +0200
committerjctanner <tanner.jc@gmail.com>2018-04-11 21:50:35 +0200
commit12431d23cdb47d89318b54575a5342418b26ba82 (patch)
treee1f1249d083b1c688a21da91126018c62739e6b0 /contrib
parentplaybooks_variables.rst: fix facts code-block (#38520) (diff)
downloadansible-12431d23cdb47d89318b54575a5342418b26ba82.tar.xz
ansible-12431d23cdb47d89318b54575a5342418b26ba82.zip
VMware: Support for multiple jinja filters in vmware_inventory (#38173)
This fix adds support for multiple jinja filters for groupby_patterns and host_filters. Fixes: #37961 Signed-off-by: Abhijeet Kasurde <akasurde@redhat.com>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/inventory/vmware_inventory.py18
1 files changed, 15 insertions, 3 deletions
diff --git a/contrib/inventory/vmware_inventory.py b/contrib/inventory/vmware_inventory.py
index 96ec4f6736..28977a3aed 100755
--- a/contrib/inventory/vmware_inventory.py
+++ b/contrib/inventory/vmware_inventory.py
@@ -287,11 +287,23 @@ class VMWareInventory(object):
self.debugl('lower keys is %s' % self.lowerkeys)
self.skip_keys = list(config.get('vmware', 'skip_keys').split(','))
self.debugl('skip keys is %s' % self.skip_keys)
- self.host_filters = list(config.get('vmware', 'host_filters').split(','))
+ temp_host_filters = list(config.get('vmware', 'host_filters').split('}},'))
+ for host_filter in temp_host_filters:
+ host_filter = host_filter.rstrip()
+ if host_filter != "":
+ if not host_filter.endswith("}}"):
+ host_filter += "}}"
+ self.host_filters.append(host_filter)
self.debugl('host filters are %s' % self.host_filters)
- self.groupby_patterns = list(config.get('vmware', 'groupby_patterns').split(','))
- self.debugl('groupby patterns are %s' % self.groupby_patterns)
+ temp_groupby_patterns = list(config.get('vmware', 'groupby_patterns').split('}},'))
+ for groupby_pattern in temp_groupby_patterns:
+ groupby_pattern = groupby_pattern.rstrip()
+ if groupby_pattern != "":
+ if not groupby_pattern.endswith("}}"):
+ groupby_pattern += "}}"
+ self.groupby_patterns.append(groupby_pattern)
+ self.debugl('groupby patterns are %s' % self.groupby_patterns)
# Special feature to disable the brute force serialization of the
# virtulmachine objects. The key name for these properties does not
# matter because the values are just items for a larger list.