Merge "Chore: Turn on SBOM for VFC"

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

diff --git a/packer/templates/memcached.json b/packer/templates/memcached.json
index 5bf1783..c25a564 100644 (file)
--- a/packer/templates/memcached.json
+++ b/packer/templates/memcached.json
@@ -1,6 +1,7 @@
 {
   "variables": {
     "ansible_roles_path": ".galaxy",
+    "arch": "x86_64",
     "base_image": null,
     "distro": null,
     "cloud_auth_url": null,
@@ -9,12 +10,13 @@
     "cloud_network": null,
     "cloud_tenant": null,
     "cloud_user_data": null,
+    "flavor": "v3-standard-2",
     "ssh_user": null,
     "ssh_proxy_host": ""
   },
   "builders": [
     {
-      "name": "vexxhost",
+      "name": "openstack",
       "image_name": "{{user `distro`}} - memcached - {{user `arch`}} - {{isotime \"20180101-1003\"}}",
       "source_image_name": "{{user `base_image`}}",
       "type": "openstack",
@@ -24,14 +26,13 @@
       "tenant_name": "{{user `cloud_tenant`}}",
       "domain_name": "Default",
       "region": "ca-ymq-1",
-      "availability_zone": "ca-ymq-2",
       "networks": [
         "{{user `cloud_network`}}"
       ],
       "user_data_file": "{{user `cloud_user_data`}}",
       "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "flavor": "v1-standard-1",
+      "flavor": "{{user `flavor`}}",
       "metadata": {
         "ci_managed": "yes"
       }
@@ -40,9 +41,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 +50,8 @@
     },
     {
       "type": "ansible",
+      "command": "./common-packer/ansible-playbook.sh",
+      "skip_version_check": true,
       "playbook_file": "provision/memcached.yaml",
       "ansible_env_vars": [
         "ANSIBLE_NOCOWS=1",