From ea98549e88c898babbe1bdc5384c87b396f4e982 Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Tue, 18 May 2021 03:36:25 +0000
Subject: [PATCH] puppet: Always install linux-image-virtual, for ksplice
 support.

---
 puppet/zulip_ops/manifests/profile/base.pp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/puppet/zulip_ops/manifests/profile/base.pp b/puppet/zulip_ops/manifests/profile/base.pp
index f10fc0edd1..bf6859164c 100644
--- a/puppet/zulip_ops/manifests/profile/base.pp
+++ b/puppet/zulip_ops/manifests/profile/base.pp
@@ -3,7 +3,10 @@ class zulip_ops::profile::base {
   include zulip_ops::munin_node
   include zulip_ops::ksplice_uptrack
 
-  $org_base_packages = [# Management for our systems
+  $org_base_packages = [
+    # Standard kernel, not AWS', so ksplice works
+    'linux-image-virtual',
+    # Management for our systems
     'openssh-server',
     'mosh',
     # package management
@@ -31,6 +34,12 @@ class zulip_ops::profile::base {
   ]
   zulip::safepackage { $org_base_packages: ensure => 'installed' }
 
+  # Uninstall the AWS kernel, but only after we install the usual one
+  package { 'linux-image-aws':
+    ensure  => absent,
+    require => Package['linux-image-virtual'],
+  }
+
   # Add system users here
   $users = []