diff --git a/roles/1-prep/tasks/computed_vars.yml b/roles/1-prep/tasks/computed_vars.yml index 9e4e7fdf4..96cb679df 100644 --- a/roles/1-prep/tasks/computed_vars.yml +++ b/roles/1-prep/tasks/computed_vars.yml @@ -11,7 +11,7 @@ - name: Discover if this is a rpi -- assume if so it is running raspbian set_fact: rpi_model: "rpi" - is_rpi: "True" + is_rpi: True when: ansible_local.local_facts.os == "raspbian" - name: Set exFAT enabled for XO laptops @@ -200,9 +200,21 @@ value: '{{ gw_active }}' - option: 'internet_available' value: '{{ internet_available }}' + - option: 'is_rpi' + value: '{{ is_rpi }}' - option: 'first_run' value: '{{ first_run }}' - option: 'local_tz' value: '{{ local_tz }}' - option: 'FQDN_changed' value: '{{ FQDN_changed }}' + +- name: add version section + ini_file: dest='{{ iiab_config_file }}' + section=runtime + option='{{ item.option }}' + value='{{ item.value }}' + with_items: + - option: 'is_VM' + value: 'yes' + when: is_VM is defined diff --git a/roles/network/tasks/computed_services.yml b/roles/network/tasks/computed_services.yml index e5b3b096f..cd28c4d1d 100644 --- a/roles/network/tasks/computed_services.yml +++ b/roles/network/tasks/computed_services.yml @@ -52,3 +52,5 @@ value: '{{ dhcp_service2 }}' - option: 'dnsmasq_enabled' value: '{{ dnsmasq_enabled }}' + - option: 'is_rpi' + value: '{{ is_rpi }}' diff --git a/roles/network/tasks/debian.yml b/roles/network/tasks/debian.yml index 33444bd8d..3ef51d66a 100644 --- a/roles/network/tasks/debian.yml +++ b/roles/network/tasks/debian.yml @@ -61,8 +61,8 @@ when: dhcpcd_result == "enabled" - name: restart the networking service - service: name=networking state=restarted - when: not is_rpi or not no_net_restart is defined + service: name=networking state=restarted + when: not is_rpi or not is_VM is defined - name: restart hostapd when wifi is present service: name=hostapd state=restarted