rename roles and add gw06

gateways.yml

 ---
 - hosts: gateways
   become: true
+  max_fail_percentage: 0
   roles:
     # - role: prepare_ansible
     #   tags: [prepare_ansible]
     - role: ffhl_access
       tags: [ffhl_access]
-    - role: base
-      tags: [base]
+    - role: common_gateway
+      tags: [common_gateway]
     - role: gwvpn
       tags: [gwvpn]
-    - role: base_bird
-      tags: [base_bird, bird]
+    - role: bird_common
+      tags: [bird_common, bird]
     - role: peering
       tags: [peering]
     - role: meshvpn

host_vars/gw06.yml

+ansible_ssh_host: gw06.ffhl.chaotikum.org
+
+# Base role
+ip4: 10.130.0.250
+ip6: 2001:67c:2d50::6:1
+ip6_ula: fdef:ffc0:3dd7::6:1
+freifunk_mac: de:ad:ca:fe:06:01
+fastd_mesh_mac: de:ad:ca:fe:06:02
+fastd_gw_mac: de:ad:ca:fe:06:03
+# dhcpd_start: 10.130.1.1
+# dhcpd_end: 10.130.7.255
+
+# exit_iface: ens18
+
+mesh_gwvpn_secret: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          64326136366162633661366239396139623830306261313035343936653462356238383633653366
+          3666383832323034663432666437356466613765353433380a616636303266343765663061633062
+          62366537623532336664346662623933356333666332633766393432626665666363373165333862
+          3163383264613865620a323334646130643463316532363130643837333032653832353763303338
+          34306632353565613435363939363138353131323639363334356630643935306336363364646338
+          61633238333730666438636362666630373066363534366266383536666639346263653937373039
+          32383138376164336630336661353336376636666561346332663933666336623536313761346162
+          39646534643038386262
+
+mesh_vpn_instances:
+  - name: ffhl_mesh_vpn0
+    secret: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          63636632656263633839313066386330363632333734336237643838353135316131636531613139
+          6231333634363734323264653731373036613336303263640a623035313064313139663134613230
+          35633365316266326138633562636237346661306431663933626566666232343030663936316132
+          3134376638643239620a303332616137333636393961383564326162613966616135343138393235
+          39393138336430303932663836636264623566633832663935633338653563373962383638306639
+          64333365653566306666363164383037663934336635316335303830396463393935306538346663
+          62353361613138616332633430636264663934373532346561353161323531393763363737343438
+          37336235313365366535
+    mac: de:ad:ca:fe:06:00
+    mtu: 1280
+    port: 10010
+  - name: ffhl_mesh_vpn1
+    secret: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          38363231313361643537303765643361323564396464316161306437623961646137346466356665
+          6139343761346437303662623635313233626237393133380a383135356365396436363830376435
+          30346134646133383961383737376334343836316134666233646536323433316638643461373738
+          3365653736653235330a653039393639636666386634663434633964323366376539393539323534
+          62396664656564376331383164633832613036383164346631366266363063646565366435333733
+          38643832343235663130306564363664393338623136636662636265396631643965663066623936
+          36653364393063656337643034356634396662646237626130366530333133383066336166353437
+          64303038303464373737
+    mac: de:ad:ca:fe:06:01
+    mtu: 1280
+    port: 10011

host_vars/holstentor.yml

-ansible_ssh_host: holstentor.mesh.ffhl.chaotikum.org
-
-# Base role
-ip4: 10.130.0.253
-ip6: 2001:67c:2d50::ccaa
-ip6_ula: fdef:ffc0:3dd7::ccaa
-freifunk_mac: de:ad:ca:fe:cc:aa
-fastd_mesh_mac: de:ad:ca:fe:cc:bb
-fastd_gw_mac: de:ad:ca:fe:cc:cc
-dhcpd_start: 10.130.1.1
-dhcpd_end: 10.130.7.255
-# edit this before deploying on final servers!!!
-exit_iface: eth0
-
-mesh_gwvpn_secret: !vault |
-  $ANSIBLE_VAULT;1.1;AES256
-  39306163643466663130653837323831336363333161396432626664393333663332613139303130
-  3663323965376338343163653438643064386364646536350a396264356531393662316664323232
-  32313837343263393534343761643630333938643136653634626661613539333564303136636433
-  6634366533393937330a316631366462303666383931613934343938383563636431313236366162
-  30373238623734666439333464393935623339393636656235356530383561653336356335663331
-  33393030383436663463666438626133326463313263616663613662373337333031653932376135
-  39366365323733363230336435363138373235653464663437386439656431373930613437616634
-  36383530626665643636
-
-mesh_vpn_instances:
-  - name: ffhl_mesh_vpn0
-    secret: !vault |
-      $ANSIBLE_VAULT;1.1;AES256
-      33666633343235306165363466316639366533663833633236663437353735663439616262626166
-      3137306636363831373939316231333933613663376435640a306262303932666334303165326331
-      34643463303634346335363735643939346334646561393038613133656365643061313863373635
-      3038326164306361660a303633323762626263373633323531663266613235393634636461383936
-      61306435666134656533393036306464373036666330326634626232363336633030373237656661
-      63373363313065333564636231313630366261323930353638653037633964326531333830323066
-      37323462643837646635323461333466373830323234643931613639653330333065316633366232
-      61393032626266383432
-    mac: de:ad:ca:fe:cc:00
-    mtu: 1280
-    port: 10010
-  - name: ffhl_mesh_vpn1
-    secret: !vault |
-      $ANSIBLE_VAULT;1.1;AES256
-      32363666373163663432663431653761616130336561303764313239393834626565386437313937
-      6465616338613239633936636231343533363765636663310a383438323339343333333465613438
-      61313638383731333534653761396566643165343335316461636530613435316461616664386430
-      3866636636363565330a653631633034623661343930303264336566326639656639333864376566
-      38393932323239643263363438656161336464623739346561616634663432393335393534633465
-      33616337373934656638313230313833383465353562373262363935306634636238656563663561
-      36633235663563396331343635376264316638353136623832386464366437343832356134646530
-      34633663383035353565
-    mac: de:ad:ca:fe:cc:01
-    mtu: 1280
-    port: 10011

host_vars/huextertor.yml

-
 ansible_ssh_host: huextertor.mesh.ffhl.chaotikum.org
 
 # Base role

hosts

@@ -7,6 +7,7 @@ kaisertor
 huextertor
 muehlentor
 gw05
+gw06
 
 [dns_auth]
 srv02