From 0f53d9de1d0cdcf676e3bb264b68aa4b897b89c9 Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Wed, 4 Sep 2019 20:12:22 -0400
Subject: [PATCH] Pass in the grid configuration
---
morph/grid.nix | 4 +++-
morph/staging002.nix | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/morph/grid.nix b/morph/grid.nix
index dc931642..f3bd9ed0 100644
--- a/morph/grid.nix
+++ b/morph/grid.nix
@@ -45,5 +45,7 @@ in
inherit (cfg) publicStoragePort;
};
- "staging002" = import ./staging002.nix;
+ # Pass the whole grid configuration to the module and let it take what it
+ # wants.
+ "staging002" = import ./staging002.nix cfg;
}
diff --git a/morph/staging002.nix b/morph/staging002.nix
index 88bed08e..04ae604c 100644
--- a/morph/staging002.nix
+++ b/morph/staging002.nix
@@ -1,7 +1,7 @@
-{ ... }:
let
cfg = import ./staging002-config.nix;
in
+{ publicStoragePort, ... }:
{
imports =
[ # Include the results of the hardware scan.
--
GitLab