Mercurial > code > home > repos > infra

changeset 207:2ce1a255a9da

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade ubuntu on plus, slash
author drewp@bigasterisk.com
date Fri, 21 Jul 2023 20:24:16 -0700
parents da0fd5a2ac33
children 7642a2dc0ff0
files inventory.py templates/sources.list.j2
diffstat 2 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/inventory.py	Fri Jul 07 16:11:58 2023 -0700
+++ b/inventory.py	Fri Jul 21 20:24:16 2023 -0700
@@ -13,7 +13,7 @@
     ('slash', {
         'ssh_hostname': 'slash',
         'wireguard_address': '10.5.0.6',
-        'mk_addr': '10.2.0.84',
+#        'mk_addr': '10.2.0.84',
     }),
     ('dot', {
         'ssh_hostname': 'dot',
@@ -54,9 +54,9 @@
         'ssh_hostname': '162.243.138.136',
         'wireguard_address': '10.5.0.2',
     }),
-#    ('plus', {
- #       'ssh_hostname': '10.5.0.110',
- #       'wireguard_address': '10.5.0.110',
- #       'mk_addr': '10.2.0.48',
- #   }),
+    ('plus', {
+        'ssh_hostname': 'plus',
+        'wireguard_address': '10.5.0.110',
+        'mk_addr': '10.2.0.48',
+    }),
 ]
--- a/templates/sources.list.j2	Fri Jul 07 16:11:58 2023 -0700
+++ b/templates/sources.list.j2	Fri Jul 21 20:24:16 2023 -0700
@@ -22,16 +22,16 @@
 deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x jammy main
 {% endif %}
 
-{% if host.name in ['squib', 'slash', 'plus'] %}
+{% if host.name in ['squib'] %}
 deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x kinetic main
 {% endif %}
 
-{% if host.name in ['dash', 'bang', 'ditto'] %}
+{% if host.name in ['dash', 'bang', 'ditto', 'slash', 'plus'] %}
 deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_18.x lunar main
 {% endif %}
 
 
-{% if host.name in ['dash', 'ditto', 'bang'] %}
+{% if host.name in ['dash', 'ditto', 'bang', 'plus', 'slash'] %}
 deb http://us.archive.ubuntu.com/ubuntu lunar main restricted
 deb http://us.archive.ubuntu.com/ubuntu lunar multiverse
 deb http://us.archive.ubuntu.com/ubuntu lunar universe
@@ -44,7 +44,7 @@
 deb http://us.archive.ubuntu.com/ubuntu lunar-updates universe
 {% endif %}
 
-{% if host.name in ['prime', 'squib', 'slash', 'plus'] %}
+{% if host.name in ['prime', 'squib'] %}
 deb http://us.archive.ubuntu.com/ubuntu kinetic main restricted
 deb http://us.archive.ubuntu.com/ubuntu kinetic multiverse
 deb http://us.archive.ubuntu.com/ubuntu kinetic universe