From 07c66e903098f8a0f20205879a5ac1b791cb1d40 Mon Sep 17 00:00:00 2001
From: Marcin Kulisz <debian@kulisz.net>
Date: Sat, 12 Nov 2016 21:47:30 +0000
Subject: [PATCH] EC2 provider: added ENA driver (installing with +

enhanced_networking set to simple)
---
 bootstrapvz/providers/ec2/__init__.py      |  4 +++
 bootstrapvz/providers/ec2/tasks/ami.py     |  1 +
 bootstrapvz/providers/ec2/tasks/network.py | 40 ++++++++++++++++++++--
 3 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/bootstrapvz/providers/ec2/__init__.py b/bootstrapvz/providers/ec2/__init__.py
index 29eabf1..3bc838a 100644
--- a/bootstrapvz/providers/ec2/__init__.py
+++ b/bootstrapvz/providers/ec2/__init__.py
@@ -68,6 +68,9 @@ def resolve_tasks(taskset, manifest):
                     tasks.tuning.BlackListModules,
                     boot.BlackListModules,
                     boot.DisableGetTTYs,
+                    tasks.boot.AddXenGrubConsoleOutputDevice,
+                    grub.WriteGrubConfig,
+                    tasks.boot.UpdateGrubConfig,
                     initd.AddExpandRoot,
                     initd.RemoveHWClock,
                     initd.InstallInitScripts,
@@ -133,6 +136,7 @@ def resolve_tasks(taskset, manifest):
     if manifest.provider.get('enhanced_networking', None) == 'simple':
         taskset.update([kernel.AddDKMSPackages,
                         tasks.network.InstallEnhancedNetworking,
+                        tasks.network.InstallENANetworking,
                         kernel.UpdateInitramfs])
 
     taskset.update([filesystem.Format,
diff --git a/bootstrapvz/providers/ec2/tasks/ami.py b/bootstrapvz/providers/ec2/tasks/ami.py
index 77fe195..202fb3b 100644
--- a/bootstrapvz/providers/ec2/tasks/ami.py
+++ b/bootstrapvz/providers/ec2/tasks/ami.py
@@ -125,6 +125,7 @@ class RegisterAMI(Task):
 
         if info.manifest.provider.get('enhanced_networking', None) == 'simple':
             registration_params['SriovNetSupport'] = 'simple'
+            registration_params['EnaSupport'] = True
 
         info._ec2['image'] = info._ec2['connection'].register_image(**registration_params)
 
diff --git a/bootstrapvz/providers/ec2/tasks/network.py b/bootstrapvz/providers/ec2/tasks/network.py
index ffcd70e..77b76f8 100644
--- a/bootstrapvz/providers/ec2/tasks/network.py
+++ b/bootstrapvz/providers/ec2/tasks/network.py
@@ -101,7 +101,8 @@ class InstallEnhancedNetworking(Task):
         log_check_call(['tar', '--ungzip',
                                '--extract',
                                '--file', archive,
-                               '--directory', os.path.join(info.root, 'usr', 'src')])
+                               '--directory', os.path.join(info.root, 'usr',
+                                                           'src')])
 
         with open(os.path.join(module_path, 'dkms.conf'), 'w') as dkms_conf:
             dkms_conf.write("""PACKAGE_NAME="ixgbevf"
@@ -118,4 +119,39 @@ AUTOINSTALL="yes"
         for task in ['add', 'build', 'install']:
             # Invoke DKMS task using specified kernel module (-m) and version (-v)
             log_check_call(['chroot', info.root,
-                            'dkms', task, '-m', 'ixgbevf', '-v', version, '-k', info.kernel_version])
+                            'dkms', task, '-m', 'ixgbevf', '-v', version, '-k',
+                            info.kernel_version])
+
+
+class InstallENANetworking(Task):
+    description = '***** Installing ENA networking kernel driver using DKMS'
+    phase = phases.system_modification
+    successors = [kernel.UpdateInitramfs]
+
+    @classmethod
+    def run(cls, info):
+        version = '1.0.0'
+        drivers_url = 'https://github.com/amzn/amzn-drivers'
+        module_path = os.path.join(info.root, 'usr', 'src',
+                                   'amzn-drivers-%s' % (version))
+
+        from bootstrapvz.common.tools import log_check_call
+        log_check_call(['git', 'clone', drivers_url, module_path])
+
+        with open(os.path.join(module_path, 'dkms.conf'), 'w') as dkms_conf:
+            dkms_conf.write("""PACKAGE_NAME="ena"
+PACKAGE_VERSION="%s"
+CLEAN="make -C kernel/linux/ena clean"
+MAKE="make -C kernel/linux/ena/ BUILD_KERNEL=${kernelver}"
+BUILT_MODULE_NAME[0]="ena"
+BUILT_MODULE_LOCATION="kernel/linux/ena"
+DEST_MODULE_LOCATION[0]="/updates"
+DEST_MODULE_NAME[0]="ena"
+AUTOINSTALL="yes"
+""" % (version))
+
+        for task in ['add', 'build', 'install']:
+            # Invoke DKMS task using specified kernel module (-m) and version (-v)
+            log_check_call(['chroot', info.root,
+                            'dkms', task, '-m', 'amzn-drivers', '-v', version,
+                            '-k', info.kernel_version])