File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -578,12 +578,12 @@ let
578578 # address of an AWS EC2 instance set this to
579579 # ${attr.unique.platform.aws.public-ipv4}.
580580 address =
581- # When using the dedicated P&T Nomad cluster on AWS we use public
582- # IPs/routing, all the other cloud runs are behind a VPC/firewall.
583- # Local runs just use 12.0.0.1 .
584- if lib . strings . hasInfix "-nomadperf" profileData . profileName
581+ # When using dedicated Nomad clusters on AWS we want to use public
582+ # IPs/routing, all the other cloud runs will run behind a
583+ # VPC/firewall .
584+ if profileData . value . cluster . aws . use_public_routing
585585 then "\ ${attr.unique.platform.aws.public-ipv4}"
586- else ""
586+ else "" # Local runs just use 127.0.0.1.
587587 ;
588588 # Specifies the port to advertise for this service. The value of
589589 # port depends on which address_mode is being used:
@@ -1398,7 +1398,7 @@ let
13981398 [
13991399 # Address string to
14001400 (
1401- if lib . strings . hasInfix "-nomadperf" profileData . profileName
1401+ if profileData . value . cluster . aws . use_public_routing
14021402 then ''--host-addr {{ env "attr.unique.platform.aws.local-ipv4" }}''
14031403 else ''--host-addr 0.0.0.0''
14041404 )
Original file line number Diff line number Diff line change @@ -107,6 +107,8 @@ def era_defaults($era):
107107 { producer : "c5.2xlarge"
108108 , explorer : "m5.4xlarge"
109109 }
110+ # "attr.unique.platform.aws.public-ipv4" to bind and service definition.
111+ , use_public_routing : false
110112 }
111113 , minimun_storage :
112114 { producer : 12582912 # 12×1024×1024
Original file line number Diff line number Diff line change @@ -212,6 +212,7 @@ def all_profile_variants:
212212 { producer : "c5.2xlarge"
213213 , explorer : "m5.4xlarge"
214214 }
215+ , use_public_routing : true
215216 }
216217 # We are requiring 10.5GB on the explorer node and 9GB on the others.
217218 , minimun_storage :
@@ -243,6 +244,7 @@ def all_profile_variants:
243244 { producer : "r5.4xlarge"
244245 , explorer : null
245246 }
247+ , use_public_routing : true
246248 }
247249 , minimun_storage : null
248250 , keep_running : true
You can’t perform that action at this time.
0 commit comments