From 2fe69599f54e8f5d4f7033060e5e96401950ecc9 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 1 Jan 2014 19:39:48 +0000 Subject: [PATCH] Don't use {{ in when, variables are bare there. --- playbooks/f19_temp_instance.yml | 4 ++-- tasks/collectd/client.yml | 4 ++-- tasks/growroot_cloud.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/playbooks/f19_temp_instance.yml b/playbooks/f19_temp_instance.yml index bca7ae3638..8fe3cd5db4 100644 --- a/playbooks/f19_temp_instance.yml +++ b/playbooks/f19_temp_instance.yml @@ -36,11 +36,11 @@ - name: resize the /dev/vda 1 fs action: command resize2fs /dev/vda1 - when: "{{ growpart.rc }} == 0" + when: growpart.rc == 0 - name: put the mbr back - b/c the resize breaks booting otherwise action: shell cat /usr/share/syslinux/mbr.bin > /dev/vda - when: "{{ growpart.rc }} == 0" + when: growpart.rc == 0 - include: "{{ tasks }}/cloud_setup_basic.yml" diff --git a/tasks/collectd/client.yml b/tasks/collectd/client.yml index 5fe0a6d5bb..a055fa917c 100644 --- a/tasks/collectd/client.yml +++ b/tasks/collectd/client.yml @@ -26,13 +26,13 @@ yum: state=installed name=collectd-apache notify: - restart collectd - when_set: {{ collectd_apache }} + when_set: collectd_apache - name: /etc/collectd/apache.conf copy: src="{{ files }}/collectd/apache.conf" dest=/etc/collectd.d/apache.conf notify: - restart collectd - when_set: {{ collectd_apache }} + when_set: collectd_apache # each of the below should move to a separate task list diff --git a/tasks/growroot_cloud.yml b/tasks/growroot_cloud.yml index ffba124b4a..32bd1e5536 100644 --- a/tasks/growroot_cloud.yml +++ b/tasks/growroot_cloud.yml @@ -17,13 +17,13 @@ - name: reboot the box action: command /sbin/reboot - when: "{{ growpart.rc }} == 0" + when: growpart.rc == 0 ignore_errors: true - name: wait for it to come back (should be quick) local_action: wait_for host={{ inventory_hostname }} port=22 delay=10 timeout=120 - when: "{{ growpart.rc }} == 0" + when: growpart.rc == 0 - name: resize the /dev/vda 2 fs action: command resize2fs /dev/vda2 - when: "{{ growpart.rc }} == 0" + when: growpart.rc == 0