diff --git a/resources/z9/z9-router/kea_dhcp.yaml b/resources/z9/z9-router/kea_dhcp.yaml index 53a89dfa..2d0033bd 100644 --- a/resources/z9/z9-router/kea_dhcp.yaml +++ b/resources/z9/z9-router/kea_dhcp.yaml @@ -6,7 +6,7 @@ kea_dhcp__dns_servers: kea_dhcp__dhcp4: enable: true - interfaces: [ "netlan.51", "netlan.52", "netlan" ] + interfaces: ["netlan.51", "netlan.52", "netlan"] subnets: - id: 1 subnet: 10.89.208.0/22 @@ -234,7 +234,7 @@ kea_dhcp__dhcp4: kea_dhcp__dhcp6: enable: true - interfaces: [ "netlan.51", "netlan.52", "netlan" ] + interfaces: ["netlan.51", "netlan.52", "netlan"] subnets: - id: 1 subnet: "2a07:c481:1:33::/64" @@ -246,7 +246,7 @@ kea_dhcp__dhcp6: - pool: "2a07:c481:1:33::/64" allocator: random reservations: - - ip-addresses: [ "2a07:c481:1:33::1c" ] + - ip-addresses: ["2a07:c481:1:33::1c"] hostname: dooris hw-address: "bc:24:11:b3:93:9c" - id: 2 @@ -258,7 +258,7 @@ kea_dhcp__dhcp6: pools: - pool: "2a07:c481:1:34::/64" reservations: - - ip-addresses: [ "2a07:c481:1:34::66" ] + - ip-addresses: ["2a07:c481:1:34::66"] hostname: esphome hw-address: "7e:3c:f0:77:8a:f4" - id: 3 @@ -270,45 +270,45 @@ kea_dhcp__dhcp6: pools: - pool: "2a07:c481:1:36::/64" reservations: - - ip-addresses: [ "2a07:c481:1:36::2" ] + - ip-addresses: ["2a07:c481:1:36::2"] hostname: sw-rack-1 hw-address: "F0:9F:C2:10:C3:AA" - - ip-addresses: [ "2a07:c481:1:36::3" ] + - ip-addresses: ["2a07:c481:1:36::3"] hostname: sw-rack-2-peo hw-address: "44:d9:e7:06:69:5d" - - ip-addresses: [ "2a07:c481:1:36::4" ] + - ip-addresses: ["2a07:c481:1:36::4"] hostname: sw-main-1 hw-address: "a8:9c:6c:16:df:cc" - - ip-addresses: [ "2a07:c481:1:36::5" ] + - ip-addresses: ["2a07:c481:1:36::5"] hostname: sw-main-2 hw-address: "a8:9c:6c:16:e8:86" - - ip-addresses: [ "2a07:c481:1:36::6" ] + - ip-addresses: ["2a07:c481:1:36::6"] hostname: sw-shop-1 hw-address: "C0:4A:00:FB:DA:C5" - - ip-addresses: [ "2a07:c481:1:36::7" ] + - ip-addresses: ["2a07:c481:1:36::7"] hostname: sw-shop-2-peo hw-address: "f4:e2:c6:bf:20:ee" - - ip-addresses: [ "2a07:c481:1:36::8" ] + - ip-addresses: ["2a07:c481:1:36::8"] hostname: sw-shop-3-peo hw-address: "d8:b3:70:85:72:76" - - ip-addresses: [ "2a07:c481:1:36::b" ] + - ip-addresses: ["2a07:c481:1:36::b"] hostname: pve01 hw-address: "38:05:25:30:80:35" - - ip-addresses: [ "2a07:c481:1:36::c" ] + - ip-addresses: ["2a07:c481:1:36::c"] hostname: pve02 hw-address: "b8:85:84:b1:57:b6" - - ip-addresses: [ "2a07:c481:1:36::d" ] + - ip-addresses: ["2a07:c481:1:36::d"] hostname: pve03 hw-address: "98:fa:9b:a2:ed:e8" - - ip-addresses: [ "2a07:c481:1:36::f" ] + - ip-addresses: ["2a07:c481:1:36::f"] hostname: pbs hw-address: "BC:24:11:D6:2C:81" - - ip-addresses: [ "2a07:c481:1:36::21" ] + - ip-addresses: ["2a07:c481:1:36::21"] hostname: unifi hw-address: "BC:24:11:25:77:60" - - ip-addresses: [ "2a07:c481:1:36::31" ] + - ip-addresses: ["2a07:c481:1:36::31"] hostname: light hw-address: "72:61:ea:e6:49:e3" - - ip-addresses: [ "2a07:c481:1:36::32" ] + - ip-addresses: ["2a07:c481:1:36::32"] hostname: club-assistant hw-address: "7a:55:61:c3:a2:89" diff --git a/resources/z9/z9-router/systemd_networkd/10-wg56.netdev b/resources/z9/z9-router/systemd_networkd/10-wg56.netdev index 241ea5af..70966e22 100644 --- a/resources/z9/z9-router/systemd_networkd/10-wg56.netdev +++ b/resources/z9/z9-router/systemd_networkd/10-wg56.netdev @@ -76,7 +76,7 @@ PresharedKeyFile = /etc/ansible_secrets/wireguard_wg55_peer_langoor_home_psk [WireGuardPeer] # friendly_name = lilly-lillysLaptop AllowedIPs = 10.89.214.16/32,2a07:c481:1:37::16/128 -PublicKey = v0MiwjhCj1w4J3fKl2d18wNIdbdd9tvdjIRQTRjIeGY= +PublicKey = IBsI+N8qUNpQnDc5HnqQ2Zo/1graFM0RMIecHmAF+Vk= [WireGuardPeer] # friendly_name = bitwhisker diff --git a/roles/kea_dhcp/meta/argument_specs.yaml b/roles/kea_dhcp/meta/argument_specs.yaml index aaa9de7c..13339ff3 100644 --- a/roles/kea_dhcp/meta/argument_specs.yaml +++ b/roles/kea_dhcp/meta/argument_specs.yaml @@ -70,7 +70,7 @@ argument_specs: interfaces: type: "list" elements: "str" - default: [ ] + default: [] control-sockets: type: "list" elements: "dict" @@ -107,7 +107,7 @@ argument_specs: interfaces: type: "list" elements: "str" - default: [ ] + default: [] control-sockets: type: "list" elements: "dict" diff --git a/roles/secrets/meta/argument_specs.yaml b/roles/secrets/meta/argument_specs.yaml index 63419ae2..2856d577 100644 --- a/roles/secrets/meta/argument_specs.yaml +++ b/roles/secrets/meta/argument_specs.yaml @@ -5,13 +5,12 @@ argument_specs: type: list required: false secrets__folder: - options: - owner: - type: str - required: false - group: - type: str - required: false - mode: - type: str - required: false + owner: + type: string + required: false + group: + type: string + required: false + mode: + type: string + required: false