From 9b457890d5a2d93ed983474407bdf7b3c83ff3b2 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Fri, 1 Sep 2023 15:42:20 -0400 Subject: [PATCH] Use separate bootstrap files for base and pvc roles --- roles/base/tasks/main.yml | 8 ++++---- roles/pvc/tasks/main.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 14bf6e0..d5bce70 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -3,10 +3,10 @@ # First run check # - name: first run check - shell: "echo 'bootstrapped' > /etc/pvc-install" + shell: "echo 'bootstrapped' > /etc/pvc-base-install" register: newhost args: - creates: "/etc/pvc-install" + creates: "/etc/pvc-base-install" # # Install custom fact scripts @@ -28,7 +28,7 @@ - host_group - dhcp_status -- name: regather local facts +- name: regather facts setup: when: installed_facts.changed @@ -56,7 +56,7 @@ when: - ansible_distribution_major_version == "buster/sid" -- name: regather distribution facts +- name: regather facts setup: when: - installed_facts.changed diff --git a/roles/pvc/tasks/main.yml b/roles/pvc/tasks/main.yml index 286c2ba..fedc614 100644 --- a/roles/pvc/tasks/main.yml +++ b/roles/pvc/tasks/main.yml @@ -2,9 +2,9 @@ # First-run check - name: check if this is a new instance - shell: "echo 'bootstrapped' > /etc/pvc-install" + shell: "echo 'bootstrapped' > /etc/pvc-pvc-install" args: - creates: /etc/pvc-install + creates: /etc/pvc-pvc-install register: newhost_check tags: always