From 4b543de41eadac5cb9c2890cb010d605599918b4 Mon Sep 17 00:00:00 2001
From: Salt <rehashedsalt@cock.li>
Date: Wed, 2 Sep 2020 22:01:31 -0500
Subject: [PATCH] Qualify some more ansible and ansible-puull related stuff

---
 roles/ansible-pull/tasks/main.yml | 35 +++++++++++++++++--------------
 roles/ansible/tasks/main.yml      | 14 ++++++++++---
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/roles/ansible-pull/tasks/main.yml b/roles/ansible-pull/tasks/main.yml
index 41900bf..371002d 100644
--- a/roles/ansible-pull/tasks/main.yml
+++ b/roles/ansible-pull/tasks/main.yml
@@ -10,20 +10,23 @@
         mode: "0600"
       become: yes
       become_user: ansible
-    - name: Template out services
-      template:
-        src: "{{ item.src }}"
-        dest: "{{ item.dest }}"
-        mode: "{{ item.mode }}"
-      loop:
-        - { src: "ansible-pull.service", dest: "/etc/systemd/system/ansible-pull.service", mode: "0644" }
-        - { src: "ansible-pull.timer", dest: "/etc/systemd/system/ansible-pull.timer", mode: "0644" }
-      notify: restart ansiblepull timer
-    - name: Enable timer
-      systemd:
-        daemon_reload: yes
-        name: ansible-pull.timer
-        enabled: yes
-        state: started
-      notify: restart ansiblepull timer
+    - name: Configure systemd unit
+      block:
+        - name: Template out services
+          template:
+            src: "{{ item.src }}"
+            dest: "{{ item.dest }}"
+            mode: "{{ item.mode }}"
+          loop:
+            - { src: "ansible-pull.service", dest: "/etc/systemd/system/ansible-pull.service", mode: "0644" }
+            - { src: "ansible-pull.timer", dest: "/etc/systemd/system/ansible-pull.timer", mode: "0644" }
+          notify: restart ansiblepull timer
+        - name: Enable timer
+          systemd:
+            daemon_reload: yes
+            name: ansible-pull.timer
+            enabled: yes
+            state: started
+          notify: restart ansiblepull timer
+      when: ansible_service_mgr == "systemd"
   become: yes
diff --git a/roles/ansible/tasks/main.yml b/roles/ansible/tasks/main.yml
index 89428e6..6e1905e 100644
--- a/roles/ansible/tasks/main.yml
+++ b/roles/ansible/tasks/main.yml
@@ -5,15 +5,23 @@
   block:
     - name: Install Ansible-required packages via apt
       apt:
-        name: "{{ packages }}"
-      vars:
-        packages:
+        name:
           - python3-pip
           - python3-boto
           - python3-boto3
           - python3-botocore
           - python3-setuptools
       become: true
+      when: ansible_distribution == "Ubuntu"
+    - name: Install Ansible-required packages via apk
+      apk:
+        name:
+          - py3-pip
+          - py3-boto
+          - py3-boto3
+          - py3-botocore
+          - py3-setuptools
+      when: ansible_distribution == "Alpine"
     - name: Install Ansible-required packages via pip
       pip:
         name: "{{ packages }}"