From 1b618daf54906286583815edea3d916a92aa79c9 Mon Sep 17 00:00:00 2001 From: Salt Date: Thu, 25 Jun 2020 02:16:06 -0500 Subject: [PATCH] Modularize ansible-pull a bit --- inventory/group_vars/all.yml | 1 + roles/ansible-pull/templates/ansible-pull.service | 2 +- roles/ansible-pull/templates/ansible-pull.timer | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml index 83b79a0..7bffa8f 100644 --- a/inventory/group_vars/all.yml +++ b/inventory/group_vars/all.yml @@ -1,5 +1,6 @@ #!/usr/bin/ansible-playbook # vim:ft=ansible: +ansible_pull_repo: "https://git.9iron.club/salt/ansible" user_username: salt zerotier_network_id: !vault | $ANSIBLE_VAULT;1.1;AES256 diff --git a/roles/ansible-pull/templates/ansible-pull.service b/roles/ansible-pull/templates/ansible-pull.service index 83a91a5..3a006c7 100644 --- a/roles/ansible-pull/templates/ansible-pull.service +++ b/roles/ansible-pull/templates/ansible-pull.service @@ -7,7 +7,7 @@ User=ansible Group=ansible Type=oneshot Environment=ANSIBLE_CONFIG=~/ansible-pull-repo/ansible-pull.cfg -ExecStart=/usr/local/bin/ansible-pull --accept-host-key -U "https://git.9iron.club/salt/ansible" -d "~/ansible-pull-repo" --vault-password-file "~/ansiblevaultpass" site.yml +ExecStart=/usr/local/bin/ansible-pull --accept-host-key -U "{{ ansible_pull_repo }}" -d "~/ansible-pull-repo" --vault-password-file "~/ansiblevaultpass" "{{ ansible_pull_playbook }}" [Install] WantedBy=multi-user.target diff --git a/roles/ansible-pull/templates/ansible-pull.timer b/roles/ansible-pull/templates/ansible-pull.timer index 2379b0e..a664818 100644 --- a/roles/ansible-pull/templates/ansible-pull.timer +++ b/roles/ansible-pull/templates/ansible-pull.timer @@ -4,8 +4,8 @@ Description=Ansible pull timer [Timer] Persistent=true -OnBootSec=15min -OnUnitActiveSec=4h +OnBootSec={{ ansible_pull_boot_delay }} +OnUnitActiveSec={{ ansible_pull_frequency }} [Install] WantedBy=timers.target