From 2d9a800f304283c72f2c6007f854071a4238bcea Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Thu, 26 Sep 2013 14:57:26 +0000 Subject: [PATCH] Update a number of only_if conditionals. --- playbooks/groups/badges-backend.yml | 2 +- playbooks/groups/badges-web.yml | 2 +- roles/badges-backend/tasks/main.yml | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml index 2ddc0e29e4..66a2fdad5c 100644 --- a/playbooks/groups/badges-backend.yml +++ b/playbooks/groups/badges-backend.yml @@ -43,7 +43,7 @@ - include: $tasks/motd.yml - include: $tasks/sudo.yml - include: $tasks/openvpn_client.yml - only_if: "'$env' != 'staging'" + when: env != "staging" - include: $tasks/fedmsg_base.yml handlers: diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index 7b0ee00e5c..92e75d7af3 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -44,7 +44,7 @@ - include: $tasks/motd.yml - include: $tasks/sudo.yml - include: $tasks/openvpn_client.yml - only_if: "'$env' != 'staging'" + when: env != "staging" - include: $tasks/fedmsg_base.yml - include: $tasks/apache.yml - include: $tasks/mod_wsgi.yml diff --git a/roles/badges-backend/tasks/main.yml b/roles/badges-backend/tasks/main.yml index fd3824ced3..8dd1d32fb9 100644 --- a/roles/badges-backend/tasks/main.yml +++ b/roles/badges-backend/tasks/main.yml @@ -63,7 +63,7 @@ mode=700 owner=fedmsg group=fedmsg - only_if: "'$env' != 'staging'" + when: env != "staging" tags: - config - cron @@ -74,7 +74,7 @@ path=$item mode=755 owner=root - only_if: "'$env' != 'staging'" + when: env != "staging" with_items: - /usr/share/badges/cronjobs/ - /etc/cron.d/ @@ -88,7 +88,7 @@ dest=/usr/share/badges/cronjobs/$item owner=fedmsg mode=744 - only_if: "'$env' != 'staging'" + when: env != "staging" with_items: - award-oldschool-badges - award-libravatar-badge @@ -102,7 +102,7 @@ dest=/etc/cron.d/$item owner=root mode=644 - only_if: "'$env' != 'staging'" + when: env != "staging" with_items: - award-oldschool-badges - award-libravatar-badge