summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLénaïc Huard <lhuard@amadeus.com>2015-06-08 09:32:59 +0200
committerLénaïc Huard <lhuard@amadeus.com>2015-06-08 09:32:59 +0200
commit3b660e9b3f3859d69371f12e18922274db7ad026 (patch)
tree53cc77cc35a071ad49f4c9611946e1fd70e6ce15
parentaf8b0b25f5e572ab20e3c3efdba596bae7ae7563 (diff)
downloadopenshift-3b660e9b3f3859d69371f12e18922274db7ad026.tar.gz
openshift-3b660e9b3f3859d69371f12e18922274db7ad026.tar.bz2
openshift-3b660e9b3f3859d69371f12e18922274db7ad026.tar.xz
openshift-3b660e9b3f3859d69371f12e18922274db7ad026.zip
Replace the custom oo_len filter by the Jinja2 standard one: length
-rw-r--r--filter_plugins/oo_filters.py8
-rw-r--r--playbooks/aws/ansible-tower/launch.yml2
-rw-r--r--playbooks/aws/openshift-cluster/tasks/launch_instances.yml2
-rw-r--r--playbooks/aws/openshift-master/launch.yml2
-rw-r--r--playbooks/aws/openshift-node/launch.yml2
5 files changed, 4 insertions, 12 deletions
diff --git a/filter_plugins/oo_filters.py b/filter_plugins/oo_filters.py
index 33d5e6cc3..fd719103d 100644
--- a/filter_plugins/oo_filters.py
+++ b/filter_plugins/oo_filters.py
@@ -23,13 +23,6 @@ class FilterModule(object):
return arg
@staticmethod
- def oo_len(arg):
- ''' This returns the length of the argument
- Ex: "{{ hostvars | oo_len }}"
- '''
- return len(arg)
-
- @staticmethod
def get_attr(data, attribute=None):
''' This looks up dictionary attributes of the form a.b.c and returns
the value.
@@ -209,7 +202,6 @@ class FilterModule(object):
"oo_select_keys": self.oo_select_keys,
"oo_collect": self.oo_collect,
"oo_flatten": self.oo_flatten,
- "oo_len": self.oo_len,
"oo_pdb": self.oo_pdb,
"oo_prepend_strings_in_list": self.oo_prepend_strings_in_list,
"oo_ami_selector": self.oo_ami_selector,
diff --git a/playbooks/aws/ansible-tower/launch.yml b/playbooks/aws/ansible-tower/launch.yml
index c23bda3a0..4bcc8b8dc 100644
--- a/playbooks/aws/ansible-tower/launch.yml
+++ b/playbooks/aws/ansible-tower/launch.yml
@@ -22,7 +22,7 @@
group_id: "{{ oo_security_group_ids }}"
instance_type: c4.xlarge
image: "{{ rhel7_ami }}"
- count: "{{ oo_new_inst_names | oo_len }}"
+ count: "{{ oo_new_inst_names | length }}"
user_data: "{{ lookup('file', user_data_file) }}"
wait: yes
assign_public_ip: "{{ oo_assign_public_ip }}"
diff --git a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
index 666a8d1fb..4f594e2ed 100644
--- a/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
+++ b/playbooks/aws/openshift-cluster/tasks/launch_instances.yml
@@ -79,7 +79,7 @@
group: "{{ ec2_security_groups }}"
instance_type: "{{ ec2_instance_type }}"
image: "{{ latest_ami }}"
- count: "{{ instances | oo_len }}"
+ count: "{{ instances | length }}"
vpc_subnet_id: "{{ ec2_vpc_subnet | default(omit, true) }}"
assign_public_ip: "{{ ec2_assign_public_ip | default(omit, true) }}"
user_data: "{{ user_data }}"
diff --git a/playbooks/aws/openshift-master/launch.yml b/playbooks/aws/openshift-master/launch.yml
index 51a0258f0..1cefad492 100644
--- a/playbooks/aws/openshift-master/launch.yml
+++ b/playbooks/aws/openshift-master/launch.yml
@@ -19,7 +19,7 @@
group: ['public']
instance_type: m3.large
image: "{{ g_ami }}"
- count: "{{ oo_new_inst_names | oo_len }}"
+ count: "{{ oo_new_inst_names | length }}"
user_data: "{{ lookup('file', user_data_file) }}"
wait: yes
register: ec2
diff --git a/playbooks/aws/openshift-node/launch.yml b/playbooks/aws/openshift-node/launch.yml
index d6024a020..e7d1f7310 100644
--- a/playbooks/aws/openshift-node/launch.yml
+++ b/playbooks/aws/openshift-node/launch.yml
@@ -19,7 +19,7 @@
group: ['public']
instance_type: m3.large
image: "{{ g_ami }}"
- count: "{{ oo_new_inst_names | oo_len }}"
+ count: "{{ oo_new_inst_names | length }}"
user_data: "{{ lookup('file', user_data_file) }}"
wait: yes
register: ec2