From 4ea8fb7509e04a3eeaa08e0ad6a86266e3b0e28e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Mon, 25 Nov 2013 19:10:22 +0000 Subject: [PATCH] Nuke some more only_if stragglers --- roles/koji_db/tasks/main.yml | 6 +++--- roles/postgresql_server/tasks/main.yml | 4 ++-- tasks/koji/releng_config.yml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/roles/koji_db/tasks/main.yml b/roles/koji_db/tasks/main.yml index 17985365fd..fd217b00de 100644 --- a/roles/koji_db/tasks/main.yml +++ b/roles/koji_db/tasks/main.yml @@ -9,7 +9,7 @@ postgresql_user: name=koji password=$aarch64kojidatabasepassword tags: - db - only_if: '$is_kojidb' + when: is_kojidb == "True" # # create a koji database if not already created # @@ -17,7 +17,7 @@ postgresql_db: name=koji owner=koji encoding=UTF-8 tags: - db - only_if: '$is_kojidb' + when: is_kojidb == "True" # # Load the initial schema and create a file to note that it's loaded now. # @@ -25,5 +25,5 @@ shell: creates=/var/lib/pgql/koji-schema psql koji koji < /usr/share/doc/koji*/docs/schema.sql tags: - db - only_if: '$is_kojidb' + when: is_kojidb == "True" diff --git a/roles/postgresql_server/tasks/main.yml b/roles/postgresql_server/tasks/main.yml index a2add82f13..735c22b87d 100644 --- a/roles/postgresql_server/tasks/main.yml +++ b/roles/postgresql_server/tasks/main.yml @@ -16,7 +16,7 @@ yum: name=koji state=installed tags: - packages - only_if: '$is_kojidb' + when: is_kojidb == "True" - name: initialize postgresql command: service postgresql initdb @@ -31,7 +31,7 @@ - restart postgresql tags: - config - only_if: '$is_kojidb' + when: is_kojidb == "True" - name: Set postgresql-server to run on boot service: name=postgresql enabled=yes diff --git a/tasks/koji/releng_config.yml b/tasks/koji/releng_config.yml index 504d722a8a..29bf29fc32 100644 --- a/tasks/koji/releng_config.yml +++ b/tasks/koji/releng_config.yml @@ -191,25 +191,25 @@ - bodhi-releng01.phx2.fedoraproject.org.crt tags: - fedmsg - only_if: "'${inventory_hostname}'.startswith('releng01')" + when: inventory_hostname.startswith('releng01') - name: fedmsg key action: copy src=$private/files/fedmsg-certs/keys/$item dest=/etc/pki/fedmsg/$item mode=640 group=masher with_items: - bodhi-releng01.phx2.fedoraproject.org.key tags: - fedmsg - only_if: "'${inventory_hostname}'.startswith('releng01')" + when: inventory_hostname.startswith('releng01') - name: fedmsg cert action: copy src=$private/files/fedmsg-certs/keys/$item dest=/etc/pki/fedmsg/$item mode=644 with_items: - bodhi-releng02.phx2.fedoraproject.org.crt tags: - fedmsg - only_if: "'${inventory_hostname}'.startswith('releng02')" + when: inventory_hostname.startswith('releng02') - name: fedmsg key action: copy src=$private/files/fedmsg-certs/keys/$item dest=/etc/pki/fedmsg/$item mode=640 group=masher with_items: - bodhi-releng02.phx2.fedoraproject.org.key tags: - fedmsg - only_if: "'${inventory_hostname}'.startswith('releng02')" + when: inventory_hostname.startswith('releng02')