Mercurial > code > home > repos > infra

changeset 20:b8105f575696

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
some host and address updates
author drewp@bigasterisk.com
date Tue, 28 Dec 2021 22:03:50 -0800
parents 357d7b779b3b
children 948d9d72267d
files inventory.py templates/wireguard/wg0.conf.j2
diffstat 2 files changed, 19 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/inventory.py	Sun Nov 21 13:13:01 2021 -0800
+++ b/inventory.py	Tue Dec 28 22:03:50 2021 -0800
@@ -4,36 +4,37 @@
 big = [
     ('bang', {
         'wireguard_address': '10.5.0.1',
-    }),
+    }),  #
     ('dash', {
+        "mac": "b8:97:5a:17:d7:1f",
         'ssh_hostname': '10.1.0.5',
-        'interface': 'enp2s0',
         'addr': '10.1.0.5',
         'wireguard_address': '10.5.0.5',
     }),
     ('slash', {
+        'mac': 'c8:60:00:98:ec:74',
         'ssh_hostname': '10.1.0.6',
-        'interface': 'enp3s0',
         'addr': '10.1.0.6',
         'wireguard_address': '10.5.0.6',
     }),
     ('dot', {
-        'ssh_hostname': '10.2.0.57',
         'interface': 'enp3s0',
+        'ssh_hostname': '10.2.0.69',
         'addr': '10.2.0.30',
         'wireguard_address': '10.5.0.30',
     })
 ]
+
 pi = [
     ('frontbed', {
+        'mac': 'b8:27:eb:e9:d3:44',
         'ssh_hostname': '10.2.0.17',
-        'interface': 'eth0',
         'addr': '10.2.0.17',
         'wireguard_address': '10.5.0.17',
     }),
     ('garage', {
-        'ssh_hostname': '10.2.0.19',
-        'interface': 'eth0',
+        'mac': 'b8:27:eb:81:17:92',
+        'ssh_hostname': '10.2.0.14',
         'addr': '10.2.0.14',
         'wireguard_address': '10.5.0.14',
     }),
@@ -41,7 +42,13 @@
 
 remote = [
     ('prime', {
+        'mac': '04:01:09:7f:89:01',
         'ssh_hostname': 'public.bigasterisk.com',
+        'addr': '162.243.138.136',
         'wireguard_address': '10.5.0.2',
     }),
+    ('plus', {
+        'ssh_hostname': '10.2.0.110',
+        'wireguard_address': '10.5.0.110',
+    }),
 ]
--- a/templates/wireguard/wg0.conf.j2	Sun Nov 21 13:13:01 2021 -0800
+++ b/templates/wireguard/wg0.conf.j2	Tue Dec 28 22:03:50 2021 -0800
@@ -19,7 +19,11 @@
     {{ peer_block('drew-note10', 'QMgx4cmuUTfJ7RH4Q46b54tSQl4eISOmdEney17fnE8=', '10.5.0.112/32') }}
 {% elif host.name == 'plus' %}
     {{ peer_block('bang',        'pAxirNVF08R6zYyudhTKjZ9fqC9UKMxknfLi5A39QVY=', '10.5.0.0/24', '10.1.0.1:1195', 50) }}
+{% elif host.name in ['dash', 'slash'] %}
+    # I see bang at 10.1.0.1
+    {{ peer_block('bang',        'pAxirNVF08R6zYyudhTKjZ9fqC9UKMxknfLi5A39QVY=', '10.5.0.0/24', '10.1.0.1:1195', 50) }}
 {% else %}
-    {{ peer_block('bang',        'pAxirNVF08R6zYyudhTKjZ9fqC9UKMxknfLi5A39QVY=', '10.5.0.0/24', '10.1.0.1:1195', 50) }}
+    # I see bang at 10.2.0.1
+    {{ peer_block('bang',        'pAxirNVF08R6zYyudhTKjZ9fqC9UKMxknfLi5A39QVY=', '10.5.0.0/24', '10.2.0.1:1195', 50) }}
 {% endif %}