Install /etc/ansible/hosts before executing other playbooks.

diff --git a/install/ansible.yaml b/install/ansible.yaml
new file mode 100644 (file)
index 0000000..11296a2
--- /dev/null
+++ b/install/ansible.yaml
@@ -0,0 +1,18 @@
+# Copyright (c) 2023 Jakub Czajka <jakub@ekhem.eu.org>
+# License: GPL-3.0 or later.
+
+- name: Install ansible and git
+  package:
+    name:
+      - ansible
+      - git
+  become: true
+- name: Create ansible directory
+  file:
+    path: /etc/ansible
+    state: directory
+  become: true
+- name: Checkout hosts to /etc/ansible
+  command: /usr/bin/git --work-tree=/etc --git-dir=/srv/git/server.git checkout \
+    main --force ansible/hosts
+  become: true

diff --git a/install/download.yaml b/install/download.yaml
index 8a3955abbe82a7cf808f95c8cad752c56df6ccfb..1496e999a3b9fc2119fa5b2cb8f18f9c592b55f4 100644 (file)
--- a/install/download.yaml
+++ b/install/download.yaml
@@ -1,6 +1,11 @@
 # Copyright (c) 2023 Jakub Czajka <jakub@ekhem.eu.org>
 # License: GPL-3.0 or later.
 
+- name: Install pip
+  package:
+    name:
+      - python3-pip
+  become: true
 - name: Install gdrive_knife
   pip:
     name: gdrive_knife

diff --git a/turnup.yaml b/turnup.yaml
index e27d9979e03c6e0be39c968612d86e3fc8ea8ca3..aca6bdd188729f7edee7d627dc6c1a6a75125a15 100644 (file)
--- a/turnup.yaml
+++ b/turnup.yaml
@@ -12,16 +12,11 @@
         users:
           - git
           - "{{ default_user }}"
-    - name: Install ansible and pip
-      package:
-        name:
-          - ansible
-          - python3-pip
-      become: true
     - include_tasks: install/download.yaml
       with_items: "{{ inputs }}"
     - include_tasks: install/certify.yaml
       with_items: "{{ certificates }}"
+    - include_tasks: install/ansible.yaml
     - include_tasks: install/environment.yaml
     - include_tasks: install/database.yaml