X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=packer%2Ftemplates%2Fdevstack-pre-pip-stein.json;h=9abb28f4a90b702000f4203d65bf9d41fb436d2b;hb=49714dcd1be7be789b2efa0de988cea03743db4b;hp=bf6f91c2f24d7ef57778da4b86bbfc7020c260a2;hpb=ddab9dafec39247aed28fbe809dd011c6b27511c;p=releng%2Fbuilder.git diff --git a/packer/templates/devstack-pre-pip-stein.json b/packer/templates/devstack-pre-pip-stein.json index bf6f91c2f..9abb28f4a 100644 --- a/packer/templates/devstack-pre-pip-stein.json +++ b/packer/templates/devstack-pre-pip-stein.json @@ -10,7 +10,8 @@ "vm_volume_size": "20", "vm_image_disk_format": "", "distro": null, - "flavor": "v2-highcpu-1", + "docker_source_image": null, + "flavor": "v3-standard-2", "ssh_user": null, "ssh_proxy_host": "" }, @@ -33,6 +34,13 @@ "use_blockstorage_volume": "{{user `vm_use_block_storage`}}", "volume_size": "{{user `vm_volume_size`}}", "image_disk_format": "{{user `vm_image_disk_format`}}" + }, + { + "name": "docker", + "type": "docker", + "image": "{{ user `docker_source_image` }}", + "commit": true, + "changes": ["ENTRYPOINT [\"\"]", "CMD [\"\"]"] } ], "provisioners": [ @@ -48,6 +56,8 @@ { "type": "ansible", "playbook_file": "provision/devstack-pre-pip.yaml", + "command": "./common-packer/ansible-playbook.sh", + "skip_version_check": true, "ansible_env_vars": [ "ANSIBLE_DEBUG=False", "ANSIBLE_NOCOWS=1",