summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorThomas Wiest <twiest@users.noreply.github.com>2015-06-09 09:33:41 -0400
committerThomas Wiest <twiest@users.noreply.github.com>2015-06-09 09:33:41 -0400
commit142ef2dd35161e4544962daff21e8477988b0618 (patch)
tree54506e2866b92c8e12b3b594e14f1fbf09cff817 /playbooks
parent9dc9035bbe6ba7980c93484b1ad7616c1687047a (diff)
parent3b660e9b3f3859d69371f12e18922274db7ad026 (diff)
downloadopenshift-142ef2dd35161e4544962daff21e8477988b0618.tar.gz
openshift-142ef2dd35161e4544962daff21e8477988b0618.tar.bz2
openshift-142ef2dd35161e4544962daff21e8477988b0618.tar.xz
openshift-142ef2dd35161e4544962daff21e8477988b0618.zip
Merge pull request #271 from lhuard1A/oo_len
Replace the custom oo_len filter by the Jinja2 standard one: length
Diffstat (limited to 'playbooks')
-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
4 files changed, 4 insertions, 4 deletions
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