X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=packer%2Ftemplates%2Fredis.json;h=657f109236d10cbf8a4c8d8b21f137efaee2b90a;hb=8c190c5efc31923635997bf51c08a4e3a8488e44;hp=2b3c03f92150232b7f9931523889341f1d78178e;hpb=c116655f4875826a25aa377ea536ad4e0f060c84;p=ci-management.git diff --git a/packer/templates/redis.json b/packer/templates/redis.json index 2b3c03f92..657f10923 100644 --- a/packer/templates/redis.json +++ b/packer/templates/redis.json @@ -14,8 +14,8 @@ }, "builders": [ { - "name": "vexxhost", - "image_name": "{{user `distro`}} - redis - {{user `arch`}} - {{isotime \"20060102-150405.000\"}}", + "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",