aw1, sim2 ff-niyawe1 -> ff-loppermann1

2 files changed, 76 insertions, 76 deletions

diff --git a/host_vars/ff-loppermann1 b/host_vars/ff-loppermann1
index 8822c35..a18f891 100644
--- a/host_vars/ff-loppermann1
+++ b/host_vars/ff-loppermann1
@@ -1,6 +1,44 @@
 ---
 ansible_host: 2a01:4f8:140:1242:ff::2
 sites:
+  - name: 'aw'
+    net4: '10.222.80.0/21'
+    net6: '2a03:2260:1016:0201::/64'
+    site_net6: 'fd62:44e1:da:0200::/64'
+    fastd_secret: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          66613864623830333561306634656664623831613235336463353433393835623633313531636164
+          3132343936323530316438366530343336393366343735390a643862663163366661383963366461
+          63356536333162306635653863386430306463323963633066626336663837633762356632393163
+          3661353338313935330a303338343231393965333534633438396261633431613734646265373830
+          30623665633364343639646539616262666663333830396363336436343938613266333963363432
+          65303930366339626331356230316236396138653735666431633437313436303862363437313738
+          38626439626562386264623534646238666436656362633432666137666334643366303733396132
+          35396461636664396633
+    fastd_mesh_mac: '02:ff:41:57:00:10'
+    fastd_port1: 10014
+    bat_ipv6: '2a03:2260:1016:0201::1'
+    bat_ipv4: '10.222.80.1'
+    bat_ipv4_cidr: 21
+    dhcp_subnet: '10.222.80.0'
+    dhcp_netmask: '255.255.248.0'
+    dhcp_start: '10.222.80.50'
+    dhcp_end: '10.222.87.250'
+    vxlan_id: 11443185
+    wireguard_mesh_number: 1
+    wireguard_mesh_priv_key: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          35303461376637356232386239353362353333383966613030646361313338663839646666306237
+          3433636237396630623830303938663735376337666337640a346635616337306235376434643265
+          66396465393962326635313966653533313638646361383638373836313063346361343364306636
+          3033393631306137630a333763386666623835623635633839616165616362633836626135323530
+          35393363646161333062396139626563383334383262333066636663663634353635626334383935
+          3437616563363566613736623361633934643962643662366338
+    wireguard_mesh_pub_key: 'tf/eNi+WOlsoXTmtAvQEwRv64YME0SIE+rlQysLd/Dc='
+    wireguard_mesh_port: 10015
+    wireguard_mesh_address: 'fe80::00ff:41ff:fe57:1'
+    wireguard_mesh_endpoint: '{{ ansible_host }}'
+    wireguard_mesh_mac: '02:ff:41:57:00:01'
   - name: 'coc'
     net4: '10.222.48.0/21'
     net6: '2a03:2260:1016:0101::/64'
@@ -39,6 +77,44 @@ sites:
     wireguard_mesh_address: 'fe80::00ff:43ff:fe4f:4301'
     wireguard_mesh_endpoint: '{{ ansible_host }}'
     wireguard_mesh_mac: '02:ff:43:4f:43:01'
+  - name: 'sim'
+    net4: '10.222.184.0/21'
+    net6: '2a03:2260:1016:0402::/64'
+    site_net6: 'fd62:44e1:da:0400::/64'
+    fastd_secret: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          39303135363836313137613238633137646235366637393463346132366361363465303531653565
+          3439336633396532303563613536333264373863663933650a653566626462346133363433333337
+          64333138353862613937653065613136323238666336363635643062643538363265323335643766
+          6465393863393630640a643531376464336334346530393764376139623033336139616138653534
+          64616531313665336365323331616263613336313938316663383437353532316631636138663661
+          37666538656533346365393435316630323065316336303138373962393038653831623339656634
+          37343837373965393866653965366335636563303931333465656539316563646162626261633535
+          34303934616666633764
+    fastd_mesh_mac: '02:ff:53:49:4d:20'
+    fastd_port1: 10018
+    bat_ipv6: '2a03:2260:1016:0402::1'
+    bat_ipv4: '10.222.184.1'
+    bat_ipv4_cidr: 21
+    dhcp_subnet: '10.222.184.0'
+    dhcp_netmask: '255.255.248.0'
+    dhcp_start: '10.222.184.50'
+    dhcp_end: '10.222.191.250'
+    vxlan_id: 10908477
+    wireguard_mesh_number: 2
+    wireguard_mesh_priv_key: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          31343338643330396338336365636336363537633939396265336639666464643563353362613863
+          3234616436313331303433613837663033653437323839340a663838646136323265653861636539
+          63373462646430376265356533363932393861626133356536306237373730303132313366306538
+          3034653565386462640a666361653236373562653464643562636232303965663437376535646363
+          63333662333630383162326166323239333966323537303238353164373939343735366230313031
+          3731663830326363323062363637663730313736383139353732
+    wireguard_mesh_pub_key: 'hDx+zhY9WgabV3Sgp7fsfRRqNIzOP5z0Tl2t7wZjzBw='
+    wireguard_mesh_port: 10019
+    wireguard_mesh_address: 'fe80::00ff:53ff:fe49:4d02'
+    wireguard_mesh_endpoint: '{{ ansible_host }}'
+    wireguard_mesh_mac: '02:ff:53:49:4d:02'
 wireguard_bb_name: 'loppermann1'
 wireguard_bb_endpoint: '{{ ansible_host }}'
 wireguard_bb_priv_key: !vault |
diff --git a/host_vars/ff-niyawe1 b/host_vars/ff-niyawe1
index 861db5a..539c4ba 100644
--- a/host_vars/ff-niyawe1
+++ b/host_vars/ff-niyawe1
@@ -2,44 +2,6 @@
 ansible_host: 2a01:4f8:272:3d5f:2::2
 #ansible_host: 10.0.1.6
 sites:
-  - name: 'aw'
-    net4: '10.222.80.0/21'
-    net6: '2a03:2260:1016:0201::/64'
-    site_net6: 'fd62:44e1:da:0200::/64'
-    fastd_secret: !vault |
-          $ANSIBLE_VAULT;1.1;AES256
-          66613864623830333561306634656664623831613235336463353433393835623633313531636164
-          3132343936323530316438366530343336393366343735390a643862663163366661383963366461
-          63356536333162306635653863386430306463323963633066626336663837633762356632393163
-          3661353338313935330a303338343231393965333534633438396261633431613734646265373830
-          30623665633364343639646539616262666663333830396363336436343938613266333963363432
-          65303930366339626331356230316236396138653735666431633437313436303862363437313738
-          38626439626562386264623534646238666436656362633432666137666334643366303733396132
-          35396461636664396633
-    fastd_mesh_mac: '02:ff:41:57:00:10'
-    fastd_port1: 10014
-    bat_ipv6: '2a03:2260:1016:0201::1'
-    bat_ipv4: '10.222.80.1'
-    bat_ipv4_cidr: 21
-    dhcp_subnet: '10.222.80.0'
-    dhcp_netmask: '255.255.248.0'
-    dhcp_start: '10.222.80.50'
-    dhcp_end: '10.222.87.250'
-    vxlan_id: 11443185
-    wireguard_mesh_number: 1
-    wireguard_mesh_priv_key: !vault |
-          $ANSIBLE_VAULT;1.1;AES256
-          35303461376637356232386239353362353333383966613030646361313338663839646666306237
-          3433636237396630623830303938663735376337666337640a346635616337306235376434643265
-          66396465393962326635313966653533313638646361383638373836313063346361343364306636
-          3033393631306137630a333763386666623835623635633839616165616362633836626135323530
-          35393363646161333062396139626563383334383262333066636663663634353635626334383935
-          3437616563363566613736623361633934643962643662366338
-    wireguard_mesh_pub_key: 'tf/eNi+WOlsoXTmtAvQEwRv64YME0SIE+rlQysLd/Dc='
-    wireguard_mesh_port: 10015
-    wireguard_mesh_address: 'fe80::00ff:41ff:fe57:1'
-    wireguard_mesh_endpoint: '{{ ansible_host }}'
-    wireguard_mesh_mac: '02:ff:41:57:00:01'
   - name: 'ems'
     net4: '10.222.200.0/21'
     net6: '2a03:2260:1016:0502::/64'
@@ -154,44 +116,6 @@ sites:
     wireguard_mesh_address: 'fe80::00ff:4dff:fe59:2'
     wireguard_mesh_endpoint: '{{ ansible_host }}'
     wireguard_mesh_mac: '02:ff:4d:59:00:02'
-  - name: 'sim'
-    net4: '10.222.184.0/21'
-    net6: '2a03:2260:1016:0402::/64'
-    site_net6: 'fd62:44e1:da:0400::/64'
-    fastd_secret: !vault |
-          $ANSIBLE_VAULT;1.1;AES256
-          39303135363836313137613238633137646235366637393463346132366361363465303531653565
-          3439336633396532303563613536333264373863663933650a653566626462346133363433333337
-          64333138353862613937653065613136323238666336363635643062643538363265323335643766
-          6465393863393630640a643531376464336334346530393764376139623033336139616138653534
-          64616531313665336365323331616263613336313938316663383437353532316631636138663661
-          37666538656533346365393435316630323065316336303138373962393038653831623339656634
-          37343837373965393866653965366335636563303931333465656539316563646162626261633535
-          34303934616666633764
-    fastd_mesh_mac: '02:ff:53:49:4d:20'
-    fastd_port1: 10018
-    bat_ipv6: '2a03:2260:1016:0402::1'
-    bat_ipv4: '10.222.184.1'
-    bat_ipv4_cidr: 21
-    dhcp_subnet: '10.222.184.0'
-    dhcp_netmask: '255.255.248.0'
-    dhcp_start: '10.222.184.50'
-    dhcp_end: '10.222.191.250'
-    vxlan_id: 10908477
-    wireguard_mesh_number: 2
-    wireguard_mesh_priv_key: !vault |
-          $ANSIBLE_VAULT;1.1;AES256
-          31343338643330396338336365636336363537633939396265336639666464643563353362613863
-          3234616436313331303433613837663033653437323839340a663838646136323265653861636539
-          63373462646430376265356533363932393861626133356536306237373730303132313366306538
-          3034653565386462640a666361653236373562653464643562636232303965663437376535646363
-          63333662333630383162326166323239333966323537303238353164373939343735366230313031
-          3731663830326363323062363637663730313736383139353732
-    wireguard_mesh_pub_key: 'hDx+zhY9WgabV3Sgp7fsfRRqNIzOP5z0Tl2t7wZjzBw='
-    wireguard_mesh_port: 10019
-    wireguard_mesh_address: 'fe80::00ff:53ff:fe49:4d02'
-    wireguard_mesh_endpoint: '{{ ansible_host }}'
-    wireguard_mesh_mac: '02:ff:53:49:4d:02'
 wireguard_bb_name: 'niyawe1'
 wireguard_bb_endpoint: '{{ ansible_host }}'
 wireguard_bb_priv_key: !vault |