Merge pull request #346 from stackhpc/fix/packer-ansible-plugin

sjpb · web-flow · commit bfa719f3832a · 2024-01-02T12:05:32.000Z
Fix removal of packer bundled ansible plugin
diff --git a/environments/.stackhpc/terraform/main.tf b/environments/.stackhpc/terraform/main.tf
@@ -13,7 +13,7 @@ variable "cluster_name" {
 variable "cluster_image" {
     description = "single image for all cluster nodes - a convenience for CI"
     type = string
-    default = "openhpc-231208-1207-b69af6e2" # https://github.com/stackhpc/ansible-slurm-appliance/pull/341
+    default = "openhpc-240102-1025-e533fd70" # https://github.com/stackhpc/ansible-slurm-appliance/pull/346
     # default = "Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qcow2"
 }
 
diff --git a/packer/openstack.pkr.hcl b/packer/openstack.pkr.hcl
@@ -11,6 +11,10 @@ packer {
       version = ">= 1.0.0"
       source  = "github.com/hashicorp/openstack"
     }
+    ansible = {
+      version = ">= 1.1.1"
+      source  = "github.com/hashicorp/ansible"
+    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ variable "cluster_name" {`
`13`	`13`	`variable "cluster_image" {`
`14`	`14`	`description = "single image for all cluster nodes - a convenience for CI"`
`15`	`15`	`type = string`
`16`		`- default = "openhpc-231208-1207-b69af6e2" # https://github.com/stackhpc/ansible-slurm-appliance/pull/341`
	`16`	`+ default = "openhpc-240102-1025-e533fd70" # https://github.com/stackhpc/ansible-slurm-appliance/pull/346`
`17`	`17`	`# default = "Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qcow2"`
`18`	`18`	`}`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,10 @@ packer {`
`11`	`11`	`version = ">= 1.0.0"`
`12`	`12`	`source = "github.com/hashicorp/openstack"`
`13`	`13`	`}`
	`14`	`+ ansible = {`
	`15`	`+ version = ">= 1.1.1"`
	`16`	`+ source = "github.com/hashicorp/ansible"`
	`17`	`+ }`
`14`	`18`	`}`
`15`	`19`	`}`
`16`	`20`