From 1a627bddd29ac2bda5f70e1a6641ddcc0efd6a9f Mon Sep 17 00:00:00 2001 From: Tim Moody Date: Sun, 4 Jun 2017 10:19:34 -0400 Subject: [PATCH] change rpi detection to use Raspbian id --- roles/1-prep/tasks/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/roles/1-prep/tasks/main.yml b/roles/1-prep/tasks/main.yml index b0a9d772b..461bb2657 100644 --- a/roles/1-prep/tasks/main.yml +++ b/roles/1-prep/tasks/main.yml @@ -1,4 +1,4 @@ -- name: Set flag for fedora 18 +- name: Set flag for fedora 18 set_fact: is_F18: True when: ansible_distribution_release == "based on Fedora 18" or ansible_distribution_version == "18" @@ -17,7 +17,7 @@ tags: - download -#TODO: Use regexp filter instead of hard-code ip +#TODO: Use regexp filter instead of hard-code ip - name: Update chrony config file template: backup=no dest=/etc/chrony.conf @@ -33,11 +33,11 @@ when: selinux_disabled is defined and selinux_disabled.changed ## DISCOVER PLATFORMS ###### -- name: Discover if this is a rpi -- if so it has a bcm2709 processor - set_fact: +- name: Discover if this is a rpi -- assume if so it is running raspbian + set_fact: rpi_model: "rpi" is_rpi: "True" - when: ansible_cmdline["bcm2709.serial"] is defined + when: ansible_lsb["id"] == "Raspbian" ignore_errors: true - include: prep.yml @@ -48,7 +48,7 @@ - include: computed_vars.yml - include: detected_network.yml - when: not installing + when: not installing # Patch Fedora 21+ so usbmount works # Set flag to True that was initialized to False in role defaults