From 4e576979064674a239a7172999813124a2d22f7a Mon Sep 17 00:00:00 2001 From: Salt Date: Sat, 21 Mar 2020 22:29:36 -0500 Subject: [PATCH] Generalize pull role, apply it to desktop machines --- desktop.yml | 4 +++- roles/ansiblehost/defaults/main.yml | 2 ++ roles/ansiblehost/tasks/main.yml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 roles/ansiblehost/defaults/main.yml diff --git a/desktop.yml b/desktop.yml index 24cf5b8..28be012 100644 --- a/desktop.yml +++ b/desktop.yml @@ -5,4 +5,6 @@ roles: - common - desktop - - localansible + - role: localansible + vars: + pullplaybook: "desktop.yml" diff --git a/roles/ansiblehost/defaults/main.yml b/roles/ansiblehost/defaults/main.yml new file mode 100644 index 0000000..4a3c25b --- /dev/null +++ b/roles/ansiblehost/defaults/main.yml @@ -0,0 +1,2 @@ +# vim:ft=ansible: +pullplaybook: "ec2.yml" diff --git a/roles/ansiblehost/tasks/main.yml b/roles/ansiblehost/tasks/main.yml index 9a51274..5f5d799 100644 --- a/roles/ansiblehost/tasks/main.yml +++ b/roles/ansiblehost/tasks/main.yml @@ -49,5 +49,5 @@ minute: "0" hour: "*/12" name: ansible-pull - job: "cd /opt/ansible-repo && HOME=/root /usr/local/bin/ansible-playbook ec2.yml --vault-password-file /root/ansiblevaultpass > /var/log/ansible-pull.log 2>&1" + job: "cd /opt/ansible-repo && HOME=/root /usr/local/bin/ansible-playbook \"{{ pullplaybook }}\" --vault-password-file /root/ansiblevaultpass > /var/log/ansible-pull.log 2>&1" become: true