Set builder name and type to "openstack"

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." This would require to hardcode the builder name and type
in the templates.

This change requires an update in global-jjb v0.60.3
and common-packer v0.7.4.

Change-Id: I506959b8c1999619877432ebba7a6947ce0b0c2c
LF-JIRA: https://jira.linuxfoundation.org/browse/RELENG-3448
Issue-ID: CIMAN-33
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/packer/templates/helm.json b/packer/templates/helm.json
index 51a151c..93f9161 100644 (file)
--- a/packer/templates/helm.json
+++ b/packer/templates/helm.json
@@ -14,7 +14,7 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "ZZCI - {{user `distro`}} - helm - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}",
       "instance_name": "{{user `distro`}}-builder-{{uuid}}",
       "source_image_name": "{{user `base_image`}}",

diff --git a/packer/templates/memcached.json b/packer/templates/memcached.json
index 5bf1783..cd6daee 100644 (file)
--- a/packer/templates/memcached.json
+++ b/packer/templates/memcached.json
@@ -14,7 +14,7 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "{{user `distro`}} - memcached - {{user `arch`}} - {{isotime \"20180101-1003\"}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",

diff --git a/packer/templates/redis.json b/packer/templates/redis.json
index 87caeee..b52a8ac 100644 (file)
--- a/packer/templates/redis.json
+++ b/packer/templates/redis.json
@@ -14,7 +14,7 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "{{user `distro`}} - redis - {{user `arch`}} - {{isotime \"20180101-1003\"}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",