From 3b507d55e26e119106d13dccf4e787efd5aa8024 Mon Sep 17 00:00:00 2001 From: Seth Vidal Date: Mon, 20 May 2013 20:25:00 +0000 Subject: [PATCH] convert first_available_files to with_first_found --- tasks/base.yml | 10 +++++----- tasks/postfix_basic.yml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tasks/base.yml b/tasks/base.yml index 52c80b17e8..9b7761b298 100644 --- a/tasks/base.yml +++ b/tasks/base.yml @@ -2,7 +2,7 @@ - name: sshd_config action: copy src=$sshd_config dest=/etc/ssh/sshd_config mode=600 - first_available_file: + with_first_found: - $sshd_config - ${files}/ssh/sshd_config.${ansible_fqdn} - ${files}/ssh/sshd_config.${host_group} @@ -68,7 +68,7 @@ - name: iptables action: template src=$item dest=/etc/sysconfig/iptables mode=600 - first_available_file: + with_first_found: - $iptables - $files/iptables/iptables.${ansible_fqdn} - $files/iptables/iptables.${host_group} @@ -82,7 +82,7 @@ # XXX fixme # a datacenter 'fact' from setup - name: /etc/resolv.conf action: copy src=$resolvconf dest=/etc/resolv.conf - first_available_file: + with_first_found: - $resolvconf - $files/resolv.conf/${ansible_fqdn} - $files/resolv.conf/${host_group} @@ -94,7 +94,7 @@ - name: rsyslog.conf action: copy src=$rsyslogconf dest=/etc/rsyslog.conf mode=644 - first_available_file: + with_first_found: - $rsyslogconf - $files/rsyslog/rsyslog.conf.${ansible_fqdn} - $files/rsyslog/rsyslog.conf.${host_group} @@ -109,7 +109,7 @@ - name: /etc/postfix/main.cf action: copy src=$item dest=/etc/postfix/main.cf - first_available_file: + with_first_found: - $postfix_maincf - $files/postfix/main.cf.${ansible_fqdn} - $files/postfix/main.cf.${host_group} diff --git a/tasks/postfix_basic.yml b/tasks/postfix_basic.yml index 83cc6ef7e8..6a9206ece2 100644 --- a/tasks/postfix_basic.yml +++ b/tasks/postfix_basic.yml @@ -5,7 +5,7 @@ - name: /etc/postfix/main.cf action: copy src=$item dest=/etc/postfix/main.cf - first_available_file: + with_first_found: - $postfix_maincf - $files/postfix/main.cf.${ansible_fqdn} - $files/postfix/main.cf.${inventory_hostname}