From 1858e47979aa4ad5340ed3f3068e2bbf05489f15 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 24 Jun 2021 14:56:24 -0400
Subject: [PATCH] Promote virtual hardware to a gridlib feature
---
morph/grid/local/grid.nix | 8 ++++----
morph/lib/default.nix | 1 +
.../virtual-hardware.nix => lib/hardware-virtual.nix} | 0
morph/{grid/local => lib}/vagrant-guest.nix | 0
4 files changed, 5 insertions(+), 4 deletions(-)
rename morph/{grid/local/virtual-hardware.nix => lib/hardware-virtual.nix} (100%)
rename morph/{grid/local => lib}/vagrant-guest.nix (100%)
diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix
index 88c19818..1729425d 100644
--- a/morph/grid/local/grid.nix
+++ b/morph/grid/local/grid.nix
@@ -13,7 +13,7 @@ let
payments = let publicIPv4 = "192.168.67.21"; in {
imports = [
gridlib.issuer
- (import ./virtual-hardware.nix ({ inherit publicIPv4; }))
+ (gridlib.hardware-virtual ({ inherit publicIPv4; }))
(gridlib.customize-issuer (config // {
monitoringvpnIPv4 = "172.23.23.11";
}))
@@ -23,7 +23,7 @@ let
storage1 = let publicIPv4 = "192.168.67.22"; in {
imports = [
gridlib.storage
- (import ./virtual-hardware.nix ({ inherit publicIPv4; }))
+ (gridlib.hardware-virtual ({ inherit publicIPv4; }))
(gridlib.customize-storage (config // {
inherit publicIPv4;
monitoringvpnIPv4 = "172.23.23.12";
@@ -35,7 +35,7 @@ let
storage2 = let publicIPv4 = "192.168.67.23"; in {
imports = [
gridlib.storage
- (import ./virtual-hardware.nix ({ inherit publicIPv4; }))
+ (gridlib.hardware-virtual ({ inherit publicIPv4; }))
(gridlib.customize-storage (config // {
inherit publicIPv4;
monitoringvpnIPv4 = "172.23.23.13";
@@ -47,7 +47,7 @@ let
monitoring = let publicIPv4 = "192.168.67.24"; in {
imports = [
gridlib.monitoring
- (import ./virtual-hardware.nix ({ inherit publicIPv4; }))
+ (gridlib.hardware-virtual ({ inherit publicIPv4; }))
(gridlib.customize-monitoring {
inherit hostsMap publicIPv4 vpnClientIPs nodeExporterTargets;
inherit (config) monitoringvpnKeyDir;
diff --git a/morph/lib/default.nix b/morph/lib/default.nix
index 72d30dd6..bdd92f4b 100644
--- a/morph/lib/default.nix
+++ b/morph/lib/default.nix
@@ -3,6 +3,7 @@
# directly importing the source files in this directory.
{
hardware-aws = import ./issuer-aws.nix;
+ hardware-virtual = import ./hardware-virtual.nix;
issuer = import ./issuer.nix;
customize-issuer = import ./customize-issuer.nix;
diff --git a/morph/grid/local/virtual-hardware.nix b/morph/lib/hardware-virtual.nix
similarity index 100%
rename from morph/grid/local/virtual-hardware.nix
rename to morph/lib/hardware-virtual.nix
diff --git a/morph/grid/local/vagrant-guest.nix b/morph/lib/vagrant-guest.nix
similarity index 100%
rename from morph/grid/local/vagrant-guest.nix
rename to morph/lib/vagrant-guest.nix
--
GitLab