Skip to content
Snippets Groups Projects
Commit 585d5d43 authored by Jean-Paul Calderone's avatar Jean-Paul Calderone
Browse files

Stop using make-grid for production deployment

parent e6e9fcc1
Branches
No related tags found
No related merge requests found
# See morph/grid/local/grid.nix for additional commentary. # See morph/grid/local/grid.nix for additional commentary.
let lib = import ../../lib;
in lib.make-grid {
name = "Production";
config = ./config.json;
nodes = cfg:
let let
pkgs = import <nixpkgs> { };
lib = import ../../lib;
config = pkgs.lib.trivial.importJSON ./config.json;
sshUsers = import ./secrets/users.nix; sshUsers = import ./secrets/users.nix;
# Get absolute vpn key directory path, as a string: # Get absolute vpn key directory path, as a string:
monitoringvpnKeyDir = toString ./. + "/${cfg.monitoringvpnKeyDir}"; monitoringvpnKeyDir = toString ./. + "/${config.monitoringvpnKeyDir}";
# TBD: derive these automatically:
hostsMap = {
"172.23.23.1" = [ "monitoring" "monitoring.monitoringvpn" ];
"172.23.23.11" = [ "payments" "payments.monitoringvpn" ];
"172.23.23.21" = [ "storage001" "storage001.monitoringvpn" ];
"172.23.23.22" = [ "storage002" "storage002.monitoringvpn" ];
"172.23.23.23" = [ "storage003" "storage003.monitoringvpn" ];
"172.23.23.24" = [ "storage004" "storage004.monitoringvpn" ];
"172.23.23.25" = [ "storage005" "storage005.monitoringvpn" ];
};
vpnClientIPs = [
"172.23.23.11"
"172.23.23.21"
"172.23.23.22"
"172.23.23.23"
"172.23.23.24"
"172.23.23.25"
];
nodeExporterTargets = [
"monitoring"
"payments"
"storage001"
"storage002"
"storage003"
"storage004"
"storage005"
];
"payments.privatestorage.io" = { "payments.privatestorage.io" = {
imports = [ imports = [
lib.issuer lib.issuer
lib.hardware-aws lib.hardware-aws
(lib.customize-issuer cfg sshUsers monitoringvpnKeyDir "172.23.23.11" "19.03") (lib.customize-issuer config sshUsers monitoringvpnKeyDir "172.23.23.11" "19.03")
]; ];
}; };
...@@ -68,7 +39,7 @@ in lib.make-grid { ...@@ -68,7 +39,7 @@ in lib.make-grid {
lib.storage lib.storage
# Then customize the storage system a little bit based on this node's particulars. # Then customize the storage system a little bit based on this node's particulars.
(lib.customize-storage cfg sshUsers nodecfg.publicIPv4 monitoringvpnKeyDir vpnIP stateVersion) (lib.customize-storage config sshUsers nodecfg.publicIPv4 monitoringvpnKeyDir vpnIP stateVersion)
]; ];
# And supply configuration for those hardware / network / bootloader options. # And supply configuration for those hardware / network / bootloader options.
...@@ -84,7 +55,38 @@ in lib.make-grid { ...@@ -84,7 +55,38 @@ in lib.make-grid {
storage005 = { vpnIP = "172.23.23.25"; stateVersion = "19.03"; }; storage005 = { vpnIP = "172.23.23.25"; stateVersion = "19.03"; };
}; };
# TBD: derive these automatically:
hostsMap = {
"172.23.23.1" = [ "monitoring" "monitoring.monitoringvpn" ];
"172.23.23.11" = [ "payments" "payments.monitoringvpn" ];
"172.23.23.21" = [ "storage001" "storage001.monitoringvpn" ];
"172.23.23.22" = [ "storage002" "storage002.monitoringvpn" ];
"172.23.23.23" = [ "storage003" "storage003.monitoringvpn" ];
"172.23.23.24" = [ "storage004" "storage004.monitoringvpn" ];
"172.23.23.25" = [ "storage005" "storage005.monitoringvpn" ];
};
vpnClientIPs = [
"172.23.23.11"
"172.23.23.21"
"172.23.23.22"
"172.23.23.23"
"172.23.23.24"
"172.23.23.25"
];
nodeExporterTargets = [
"monitoring"
"payments"
"storage001"
"storage002"
"storage003"
"storage004"
"storage005"
];
in { in {
network = {
description = "PrivateStorage.io Production Grid";
};
inherit "payments.privatestorage.io" "monitoring"; inherit "payments.privatestorage.io" "monitoring";
} // storageNodes; } // storageNodes
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment