diff --git a/salt/pillars/network.sls b/salt/pillars/network.sls index 0f1994b..f25c408 100644 --- a/salt/pillars/network.sls +++ b/salt/pillars/network.sls @@ -4,10 +4,13 @@ network: netaddress: 192.168.0.0 netmask: 24 ip: 192.168.0.1 + ap: 192.168.0.2 + wifipass: linux2linux interface: internal: eth0 external: eth1 + wireless: wlan0 vlan: - diff --git a/update.sh b/update.sh index 43d67b4..844f45f 100755 --- a/update.sh +++ b/update.sh @@ -119,10 +119,22 @@ function configure_network(){ sudo nmcli connection down "$SALT_network_interface_internal" sudo nmcli connection up "$SALT_network_interface_internal" + #configure wireless AP + sudo nmcli connection add type wifi ifname "$SALT_network_interface_wireless" mode ap con-name tlu-ap ssid "Transportable Lab Unit" + sudo nmcli connection modify tlu-ap 802-11-wireless.band bg + sudo nmcli connection modify tlu-ap 802-11-wireless.channel 6 + sudo nmcli connection modify tlu-ap 802-11-wireless-security.key-mgmt wpa-psk + sudo nmcli connection modify tlu-ap 802-11-wireless-security.proto rsn + sudo nmcli connection modify tlu-ap 802-11-wireless-security.group ccmp + sudo nmcli connection modify tlu-ap 802-11-wireless-security.pairwise ccmp + sudo nmcli connection modify tlu-ap 802-11-wireless-security.psk "$SALT_network_wifipass" + sudo nmcli connection modify tlu-ap ipv4.addr "${SALT_network_ap}/${SALT_network_netmask}" + sudo nmcli connection modify tlu-ap ipv4.gateway "${SALT_network_ip}" + sudo nmcli connection modify tlu-ap ipv4.dns "${SALT_network_ip}" + sudo nmcli connection modify tlu-ap ipv4.method manual + sudo nmcli connection up tlu-ap + #configure external interface - if [[ $(nmcli connection show | grep -i $SALT_network_interface_external | wc -l) == 0 ]]; then - sudo nmcli connection add type vlan con-name "$SALT_network_interface_external" ifname "$SALT_network_interface_external" dev "$SALT_network_interface_internal" id "${SALT_network_interface_external#*.}" - fi sudo nmcli connection modify "$SALT_network_interface_external" ipv4.method auto sudo nmcli connection up "$SALT_network_interface_external"