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

Drop the extra noise about non-repeated publicIPv4

parent 95a36d07
No related branches found
No related tags found
3 merge requests!140Merge staging into production,!118Merge develop into staging,!110Rationalize system host names
Pipeline #763 failed
...@@ -10,20 +10,20 @@ let ...@@ -10,20 +10,20 @@ let
monitoringvpnKeyDir = toString ./. + "/${rawConfig.monitoringvpnKeyDir}"; monitoringvpnKeyDir = toString ./. + "/${rawConfig.monitoringvpnKeyDir}";
}; };
payments = let publicIPv4 = "192.168.67.21"; in { payments = {
imports = [ imports = [
gridlib.issuer gridlib.issuer
(gridlib.hardware-virtual ({ inherit publicIPv4; })) (gridlib.hardware-virtual ({ publicIPv4 = "192.168.67.21"; }))
(gridlib.customize-issuer (config // { (gridlib.customize-issuer (config // {
monitoringvpnIPv4 = "172.23.23.11"; monitoringvpnIPv4 = "172.23.23.11";
})) }))
]; ];
}; };
storage1 = let publicIPv4 = "192.168.67.22"; in { storage1 = {
imports = [ imports = [
gridlib.storage gridlib.storage
(gridlib.hardware-virtual ({ inherit publicIPv4; })) (gridlib.hardware-virtual ({ publicIPv4 = "192.168.67.22"; }))
(gridlib.customize-storage (config // { (gridlib.customize-storage (config // {
monitoringvpnIPv4 = "172.23.23.12"; monitoringvpnIPv4 = "172.23.23.12";
stateVersion = "19.09"; stateVersion = "19.09";
...@@ -31,10 +31,10 @@ let ...@@ -31,10 +31,10 @@ let
]; ];
}; };
storage2 = let publicIPv4 = "192.168.67.23"; in { storage2 = {
imports = [ imports = [
gridlib.storage gridlib.storage
(gridlib.hardware-virtual ({ inherit publicIPv4; })) (gridlib.hardware-virtual ({ publicIPv4 = "192.168.67.23"; }))
(gridlib.customize-storage (config // { (gridlib.customize-storage (config // {
monitoringvpnIPv4 = "172.23.23.13"; monitoringvpnIPv4 = "172.23.23.13";
stateVersion = "19.09"; stateVersion = "19.09";
...@@ -42,10 +42,10 @@ let ...@@ -42,10 +42,10 @@ let
]; ];
}; };
monitoring = let publicIPv4 = "192.168.67.24"; in { monitoring = {
imports = [ imports = [
gridlib.monitoring gridlib.monitoring
(gridlib.hardware-virtual ({ inherit publicIPv4; })) (gridlib.hardware-virtual ({ publicIPv4 = "192.168.67.24"; }))
(gridlib.customize-monitoring { (gridlib.customize-monitoring {
inherit hostsMap vpnClientIPs nodeExporterTargets; inherit hostsMap vpnClientIPs nodeExporterTargets;
inherit (config) domain monitoringvpnKeyDir; inherit (config) domain monitoringvpnKeyDir;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment