Break the networking.hostName tie in hardware-aws

Using AWS is what causes it so using AWS can be what fixes it, too.

morph/grid/production/grid.nix

@@ -21,8 +21,7 @@ let
     };
   };
 
-  payments = {name, ...}: {
-    networking.hostName = name;
+  payments = {
     imports = [
       gridlib.issuer
       gridlib.hardware-aws
@@ -33,8 +32,7 @@ let
     ];
   };
 
-  monitoring = {name, ...}: {
-    networking.hostName = name;
+  monitoring = {
     imports = [
       gridlib.monitoring
       gridlib.hardware-aws

morph/grid/testing/grid.nix

@@ -21,8 +21,7 @@ let
     };
   };
 
-  payments = {name, ...}: {
-    networking.hostName = name;
+  payments = {
     imports = [
       gridlib.issuer
       gridlib.hardware-aws
@@ -33,10 +32,10 @@ let
     ];
   };
 
-  storage001 = {name, ...}: {
-    networking.hostName = name;
+  storage001 = {
     imports = [
       gridlib.storage
+      gridlib.hardware-aws
       ./testing001-hardware.nix
       (gridlib.customize-storage (config // {
         monitoringvpnIPv4 = "172.23.23.12";
@@ -46,8 +45,7 @@ let
     ];
   };
 
-  monitoring = {name, ...}: {
-    networking.hostName = name;
+  monitoring = {
     imports = [
       gridlib.monitoring
       gridlib.hardware-aws

morph/grid/testing/testing001-hardware.nix

 {
-  imports = [ <nixpkgs/nixos/modules/virtualisation/amazon-image.nix> ];
-  ec2.hvm = true;
-  boot.kernel.sysctl = { "vm.swappiness" = 0; };
-  swapDevices = [ {
-    device = "/var/swapfile";
-    size = 8192; # megabytes
-    randomEncryption = true;
-  } ];
-
-
   boot.supportedFilesystems = [ "zfs" ];
   networking.hostId = "10000000";
 

morph/lib/issuer-aws.nix

-{ lib, ... }: {
+{ name, lib, ... }: {
   imports = [ <nixpkgs/nixos/modules/virtualisation/amazon-image.nix> ];
-
-  # amazon-image.nix isn't quite aware of nvme-attached storage so give it a
-  # little help configuring grub.
-  boot.loader.grub.device = lib.mkForce "/dev/nvme0n1";
-
   ec2.hvm = true;
   boot.kernel.sysctl = { "vm.swappiness" = 0; };
   swapDevices = [ {
@@ -12,4 +7,14 @@
     size = 8192; # megabytes
     randomEncryption = true;
   } ];
+
+  # Break the tie between AWS and morph for the hostname by forcing the
+  # morph-supplied name.  See also
+  # <https://github.com/DBCDK/morph/issues/146>.
+  networking.hostName = name;
+
+  # amazon-image.nix isn't quite aware of nvme-attached storage so give it a
+  # little help configuring grub.
+  boot.loader.grub.device = lib.mkForce "/dev/nvme0n1";
+
 }