From 6165b31769b59a2c720c4fe5b85b1d927a2ac22d Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Thu, 24 Jun 2021 15:20:42 -0400
Subject: [PATCH] Drop the extra noise about non-repeated publicIPv4
---
morph/grid/local/grid.nix | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/morph/grid/local/grid.nix b/morph/grid/local/grid.nix
index ea8d3c41..5345a161 100644
--- a/morph/grid/local/grid.nix
+++ b/morph/grid/local/grid.nix
@@ -10,20 +10,20 @@ let
monitoringvpnKeyDir = toString ./. + "/${rawConfig.monitoringvpnKeyDir}";
};
- payments = let publicIPv4 = "192.168.67.21"; in {
+ payments = {
imports = [
gridlib.issuer
- (gridlib.hardware-virtual ({ inherit publicIPv4; }))
+ (gridlib.hardware-virtual ({ publicIPv4 = "192.168.67.21"; }))
(gridlib.customize-issuer (config // {
monitoringvpnIPv4 = "172.23.23.11";
}))
];
};
- storage1 = let publicIPv4 = "192.168.67.22"; in {
+ storage1 = {
imports = [
gridlib.storage
- (gridlib.hardware-virtual ({ inherit publicIPv4; }))
+ (gridlib.hardware-virtual ({ publicIPv4 = "192.168.67.22"; }))
(gridlib.customize-storage (config // {
monitoringvpnIPv4 = "172.23.23.12";
stateVersion = "19.09";
@@ -31,10 +31,10 @@ let
];
};
- storage2 = let publicIPv4 = "192.168.67.23"; in {
+ storage2 = {
imports = [
gridlib.storage
- (gridlib.hardware-virtual ({ inherit publicIPv4; }))
+ (gridlib.hardware-virtual ({ publicIPv4 = "192.168.67.23"; }))
(gridlib.customize-storage (config // {
monitoringvpnIPv4 = "172.23.23.13";
stateVersion = "19.09";
@@ -42,10 +42,10 @@ let
];
};
- monitoring = let publicIPv4 = "192.168.67.24"; in {
+ monitoring = {
imports = [
gridlib.monitoring
- (gridlib.hardware-virtual ({ inherit publicIPv4; }))
+ (gridlib.hardware-virtual ({ publicIPv4 = "192.168.67.24"; }))
(gridlib.customize-monitoring {
inherit hostsMap vpnClientIPs nodeExporterTargets;
inherit (config) domain monitoringvpnKeyDir;
--
GitLab