From: Anil Belur <abelur@linuxfoundation.org>
Date: Sat, 23 Jan 2021 01:45:35 +0000 (+1000)
Subject: Revert "Set packer builder type with env variable"
X-Git-Tag: v0.7.4^0
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=38f810974c2fdb9b4eb998b5efee93362904cced;p=releng%2Fcommon-packer.git

Revert "Set packer builder type with env variable"

This reverts commit cc035619ac1673a5b5ea2f6bfb843eac75ea4a9d.

Based on the input provided on the Gihub packer issue
hard-coded for our parser to be able to decode the rest of the config
properly."

Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Change-Id: If63b83eae7baa8ab6b30d8b9b187aa219ec2ba44
---

diff --git a/releasenotes/notes/set-packer-builder-type-with-env-var-490b7672b07486bc.yaml b/releasenotes/notes/set-packer-builder-type-with-env-var-490b7672b07486bc.yaml
deleted file mode 100644
index e9bb11b..0000000
--- a/releasenotes/notes/set-packer-builder-type-with-env-var-490b7672b07486bc.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-fixes:
-  - |
-    Set packer builder type with environment variable
-
-    Using the -only CLI option for packer build does not work as expected.
-    The #CR 90dd675df482a8 (global-jjb) submitted with common-packer v0.7.0
-    fails to build packer jobs because of a bug in the packer build CLI.
-
-    The `-only` option packer build CLI does not set the cloud provider
-    name/type as per the documentation. The alternative is to use an environment
-    variable that is passed through the packer job and can be reference in the
-    packer templates.
-
-    Ref:
-    https://github.com/hashicorp/packer/issues/10495
diff --git a/templates/builder.json b/templates/builder.json
index 792f95c..f4ca2f9 100644
--- a/templates/builder.json
+++ b/templates/builder.json
@@ -12,16 +12,15 @@
     "distro": null,
     "flavor": "v2-highcpu-1",
     "ssh_user": null,
-    "ssh_proxy_host": "",
-    "cloud_type": "{{env `PACKER_BUILDER`}}"
+    "ssh_proxy_host": ""
   },
   "builders": [
     {
-      "name": "{{user `cloud_type`}}",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - builder - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-builder-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",
-      "type": "{{user `cloud_type`}}",
+      "type": "openstack",
       "region": "{{user `cloud_region`}}",
       "networks": ["{{user `cloud_network`}}"],
       "user_data_file": "{{user `cloud_user_data`}}",