Merge "Chore: Turn on SBOM for MSB"

[ci-management.git] / packer / templates / redis.json

diff --git a/packer/templates/redis.json b/packer/templates/redis.json
index 20422f6..657f109 100644 (file)
--- a/packer/templates/redis.json
+++ b/packer/templates/redis.json
@@ -14,8 +14,8 @@
   },
   "builders": [
     {
-      "name": "vexxhost",
-      "image_name": "{{user `distro`}} - redis - {{isotime \"20060102-1504\"}}",
+      "name": "openstack",
+      "image_name": "{{user `distro`}} - redis - {{user `arch`}} - {{isotime \"20180101-1003\"}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
       "identity_endpoint": "{{user `cloud_auth_url`}}",
@@ -24,7 +24,6 @@
       "tenant_name": "{{user `cloud_tenant`}}",
       "domain_name": "Default",
       "region": "ca-ymq-1",
-      "availability_zone": "ca-ymq-2",
       "networks": [
         "{{user `cloud_network`}}"
       ],
@@ -40,9 +39,7 @@
   "provisioners": [
     {
       "type": "shell",
-      "scripts": [
-        "common-packer/provision/install-python.sh"
-      ],
+      "scripts": ["common-packer/provision/install-python.sh"],
       "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
     },
     {
@@ -51,6 +48,8 @@
     },
     {
       "type": "ansible",
+      "command": "./common-packer/ansible-playbook.sh",
+      "skip_version_check": true,
       "playbook_file": "provision/redis.yaml",
       "ansible_env_vars": [
         "ANSIBLE_NOCOWS=1",
@@ -62,4 +61,3 @@
     }
   ]
 }
-