diff --git a/roles/bootstrap-os/tasks/debian.yml b/roles/bootstrap-os/tasks/debian.yml index 7152f37a11e..9b18baa0642 100644 --- a/roles/bootstrap-os/tasks/debian.yml +++ b/roles/bootstrap-os/tasks/debian.yml @@ -62,7 +62,3 @@ - '"changed its" in bootstrap_update_apt_result.stdout' - '"value from" in bootstrap_update_apt_result.stdout' ignore_errors: true - -- name: Set the ansible_python_interpreter fact - set_fact: - ansible_python_interpreter: "/usr/bin/python3" diff --git a/roles/bootstrap-os/tasks/fedora-coreos.yml b/roles/bootstrap-os/tasks/fedora-coreos.yml index 91dc020c4a8..b8c0f3fe7b6 100644 --- a/roles/bootstrap-os/tasks/fedora-coreos.yml +++ b/roles/bootstrap-os/tasks/fedora-coreos.yml @@ -38,9 +38,3 @@ delay: 5 sleep: 5 when: need_bootstrap.rc != 0 - -- name: Store the fact if this is an fedora core os host - set_fact: - is_fedora_coreos: True - tags: - - facts diff --git a/roles/bootstrap-os/tasks/flatcar.yml b/roles/bootstrap-os/tasks/flatcar.yml index b0f3a9eb860..f28baa199a4 100644 --- a/roles/bootstrap-os/tasks/flatcar.yml +++ b/roles/bootstrap-os/tasks/flatcar.yml @@ -9,12 +9,6 @@ tags: - facts -- name: Force binaries directory for Flatcar Container Linux by Kinvolk - set_fact: - bin_dir: "/opt/bin" - tags: - - facts - - name: Run bootstrap.sh script: bootstrap.sh become: true @@ -22,12 +16,6 @@ when: - need_bootstrap.rc != 0 -- name: Set the ansible_python_interpreter fact - set_fact: - ansible_python_interpreter: "{{ bin_dir }}/python" - tags: - - facts - - name: Disable auto-upgrade systemd: name: locksmithd.service diff --git a/roles/bootstrap-os/vars/debian.yml b/roles/bootstrap-os/vars/debian.yml new file mode 100644 index 00000000000..f78f011a528 --- /dev/null +++ b/roles/bootstrap-os/vars/debian.yml @@ -0,0 +1,2 @@ +--- +ansible_python_interpreter: "/usr/bin/python3" diff --git a/roles/bootstrap-os/vars/fedora-coreos.yml b/roles/bootstrap-os/vars/fedora-coreos.yml new file mode 100644 index 00000000000..e0bb069f9e2 --- /dev/null +++ b/roles/bootstrap-os/vars/fedora-coreos.yml @@ -0,0 +1,2 @@ +--- +is_fedora_coreos: True diff --git a/roles/bootstrap-os/vars/flatcar.yml b/roles/bootstrap-os/vars/flatcar.yml new file mode 100644 index 00000000000..c02b924d6a3 --- /dev/null +++ b/roles/bootstrap-os/vars/flatcar.yml @@ -0,0 +1,3 @@ +--- +bin_dir: "/opt/bin" +ansible_python_interpreter: "{{ bin_dir }}/python" diff --git a/roles/bootstrap-os/vars/ubuntu.yml b/roles/bootstrap-os/vars/ubuntu.yml new file mode 120000 index 00000000000..f1a5a89f192 --- /dev/null +++ b/roles/bootstrap-os/vars/ubuntu.yml @@ -0,0 +1 @@ +debian.yml \ No newline at end of file