Commit 7293e384 authored by Andreas Schmidt's avatar Andreas Schmidt
Browse files

Update network state to properly handle netplan in 18.04.

parent 5a4da789

salt/network/files/netplan/01-netcfg.yaml

0 → 100644
+13 −0
Original line number Diff line number Diff line 
network:

    version: 2

    renderer: networkd

    ethernets:

        eth0:

            dhcp4: yes

            dhcp6: no

    wifis:

        wlan0:

            access-points:

                LARN-5GHz:

                    password: "larn1914"

            dhcp4: true

salt/network/init.sls

+18 −0
Original line number Diff line number Diff line 
{%- if grains['osrelease'] == '16.04' %}

network-manager:

    pkg.purged
@@ -10,3 +11,20 @@ network_interface_eth0: 
    file.managed:

        - name: /etc/network/interfaces.d/eth0

        - source: salt://network/files/eth0

{%- endif %}



{%- if grains['osrelease'] == '18.04' %}

netplan_cfg:

    file.recurse:

        - name: /etc/netplan

        - source: salt://network/files/netplan

        - user: root

        - group: root

        - file_mode: keep



netplan_run:

    cmd.run:

        - name: netplan generate && netplan apply

        - onchanges:

            - file: netplan_cfg

{%- endif %}

salt/network/wlan.sls

+2 −0
Original line number Diff line number Diff line 
include:

    - network



{%- if grains['osrelease'] == '16.04' %}

wpasupplicant:

    pkg.installed
@@ -13,3 +14,4 @@ wpa_supplication.conf: 
    file.managed:

        - name: /etc/wpa_supplicant/wpa_supplicant.conf

        - source: salt://network/files/wpa_supplicant.conf

 {%- endif %}