X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=packer%2Ftemplates%2Fmemcached.json;h=c05aeb2d7a4e5df2a85aa520a29c4b19001f7b8b;hb=39eb610eda1c28a54d16cc2bdbff905d2d66c0af;hp=cd6daeebedda8bfb5af35ecff27765d45beaaacd;hpb=2d0e40b49c7bf799c9a13d033f8aa15b5a86bde8;p=ci-management.git

diff --git a/packer/templates/memcached.json b/packer/templates/memcached.json
index cd6daeebe..c05aeb2d7 100644
--- 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,6 +10,7 @@
     "cloud_network": null,
     "cloud_tenant": null,
     "cloud_user_data": null,
+    "flavor": "v3-standard-2",
     "ssh_user": null,
     "ssh_proxy_host": ""
   },
@@ -24,14 +26,11 @@
       "tenant_name": "{{user `cloud_tenant`}}",
       "domain_name": "Default",
       "region": "ca-ymq-1",
-      "availability_zone": "ca-ymq-2",
-      "networks": [
-        "{{user `cloud_network`}}"
-      ],
+      "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 +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/memcached.yaml",
       "ansible_env_vars": [
         "ANSIBLE_NOCOWS=1",