Merge branch 'main' into fix/no_proxy_localhost

sjpb · web-flow · commit 68896e52f2e6 · 2023-05-09T10:20:08.000+01:00
diff --git a/packer/openstack.pkr.hcl b/packer/openstack.pkr.hcl
@@ -101,6 +101,11 @@ variable "floating_ip_network" {
   default = null
 }
 
+variable "manifest_output_path" {
+  type = string
+  default = "packer-manifest.json"
+}
+
 variable "use_blockstorage_volume" {
   type = bool
   default = false
@@ -157,6 +162,7 @@ build {
   }
 
   post-processor "manifest" {
+    output = "${var.manifest_output_path}"
     custom_data  = {
       source = "${source.name}"
     }
@@ -181,6 +187,7 @@ build {
   }
 
   post-processor "manifest" {
+    output = "${var.manifest_output_path}"
     custom_data  = {
       source = "${source.name}"
     }

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,11 @@ variable "floating_ip_network" {`
`101`	`101`	`default = null`
`102`	`102`	`}`
`103`	`103`
	`104`	`+variable "manifest_output_path" {`
	`105`	`+ type = string`
	`106`	`+ default = "packer-manifest.json"`
	`107`	`+}`
	`108`	`+`
`104`	`109`	`variable "use_blockstorage_volume" {`
`105`	`110`	`type = bool`
`106`	`111`	`default = false`
`@@ -157,6 +162,7 @@ build {`
`157`	`162`	`}`
`158`	`163`
`159`	`164`	`post-processor "manifest" {`
	`165`	`+ output = "${var.manifest_output_path}"`
`160`	`166`	`custom_data = {`
`161`	`167`	`source = "${source.name}"`
`162`	`168`	`}`
`@@ -181,6 +187,7 @@ build {`
`181`	`187`	`}`
`182`	`188`
`183`	`189`	`post-processor "manifest" {`
	`190`	`+ output = "${var.manifest_output_path}"`
`184`	`191`	`custom_data = {`
`185`	`192`	`source = "${source.name}"`
`186`	`193`	`}`