use FIP for build on Arcus to avoid docker ratelimits on portal-internal outbound IP

sjpb · sjpb · commit f61f98e52fb8 · 2024-01-12T12:36:23.000Z
diff --git a/environments/.stackhpc/ARCUS.pkrvars.hcl b/environments/.stackhpc/ARCUS.pkrvars.hcl
@@ -8,5 +8,6 @@ fatimage_source_image_name = "Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qc
 ssh_keypair_name = "slurm-app-ci"
 ssh_private_key_file = "~/.ssh/id_rsa"
 security_groups = ["default", "SSH"]
-ssh_bastion_host = "128.232.222.183"
-ssh_bastion_username = "slurm-app-ci"
+// ssh_bastion_host = "128.232.222.183"
+// ssh_bastion_username = "slurm-app-ci"
+floating_ip_network = "CUDN-Internet" # Use FIP to avoid docker ratelimits on portal-internal outbound IP
diff --git a/packer/openstack.pkr.hcl b/packer/openstack.pkr.hcl
@@ -92,12 +92,12 @@ variable "image_visibility" {
 
 variable "ssh_bastion_host" {
   type = string
-  default = ""
+  default = null
 }
 
 variable "ssh_bastion_username" {
   type = string
-  default = ""
+  default = null
 }
 
 variable "ssh_bastion_private_key_file" {

Original file line number	Diff line number	Diff line change
`@@ -92,12 +92,12 @@ variable "image_visibility" {`
`92`	`92`
`93`	`93`	`variable "ssh_bastion_host" {`
`94`	`94`	`type = string`
`95`		`- default = ""`
	`95`	`+ default = null`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`variable "ssh_bastion_username" {`
`99`	`99`	`type = string`
`100`		`- default = ""`
	`100`	`+ default = null`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`variable "ssh_bastion_private_key_file" {`