EOL GCE

bundles/gce-workaround/items.py

@@ -1,33 +0,0 @@
-svc_systemd = {}
-pkg_apt = {}
-
-for i in {
-    'gce-disk-expand',
-    'google-cloud-packages-archive-keyring',
-    'google-cloud-sdk',
-    'google-compute-engine',
-    'google-compute-engine-oslogin',
-    'google-guest-agent',
-    'google-osconfig-agent',
-}:
-    pkg_apt[i] = {
-        'installed': False,
-    }
-
-for i in {
-    'google-accounts-daemon.service',
-    'google-accounts-manager.service',
-    'google-clock-skew-daemon.service',
-    'google-clock-sync-manager.service',
-    'google-guest-agent.service',
-    'google-osconfig-agent.service',
-    'google-shutdown-scripts.service',
-    'google-startup-scripts.service',
-    'sshguard.service',
-
-    'google-oslogin-cache.timer',
-}:
-    svc_systemd[i] = {
-        'enabled': False,
-        'running': False,
-    }

bundles/icinga2/items.py

@@ -335,19 +335,14 @@ for rnode in sorted(repo.nodes):
     host_ips = repo.libs.tools.resolve_identifier(repo, rnode.name, only_physical=True)
     icinga_ips = {}
 
-    # XXX for the love of god, PLEASE remove this once DNS is no longer
-    # hosted at GCE
-    if rnode.in_group('gce'):
-        icinga_ips['ipv4'] = rnode.metadata.get('external_ipv4')
-    else:
-        for ip_type in ('ipv4', 'ipv6'):
-            for ip in sorted(host_ips[ip_type]):
-                if ip.is_private and not ip.is_link_local:
-                    icinga_ips[ip_type] = str(ip)
-                    break
-            else:
-                if host_ips[ip_type]:
-                    icinga_ips[ip_type] = sorted(host_ips[ip_type])[0]
+    for ip_type in ('ipv4', 'ipv6'):
+        for ip in sorted(host_ips[ip_type]):
+            if ip.is_private and not ip.is_link_local:
+                icinga_ips[ip_type] = str(ip)
+                break
+        else:
+            if host_ips[ip_type]:
+                icinga_ips[ip_type] = sorted(host_ips[ip_type])[0]
 
     if not icinga_ips:
         raise ValueError(f'{rnode.name} requests monitoring, but has neither IPv4 nor IPv6 addresses!')