X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=packer%2Ftemplates%2Fdevstack-pre-pip-newton.json;h=5de50fcb9e7923f4d70bdf84c22c0f74776b095f;hb=63e9993ad921bad51c005e410942287368308229;hp=a97d82644e838cfe7a56b58909702c11e946612d;hpb=554e68c1dced55cf7d79539a26a386fff92c4fdc;p=releng%2Fbuilder.git diff --git a/packer/templates/devstack-pre-pip-newton.json b/packer/templates/devstack-pre-pip-newton.json index a97d82644..5de50fcb9 100644 --- a/packer/templates/devstack-pre-pip-newton.json +++ b/packer/templates/devstack-pre-pip-newton.json @@ -7,7 +7,6 @@ "public_tenant": null, "public_user": null, "public_pass": null, - "private_base_image": null, "private_network": null, "private_cloud_user": null, @@ -15,7 +14,6 @@ "private_tenant": null, "private_user": null, "private_pass": null, - "distro": null, "cloud_user_data": null }, @@ -29,8 +27,8 @@ "password": "{{user `public_pass`}}", "region": "DFW", "ssh_username": "{{user `public_cloud_user`}}", - "image_name": "{{user `distro`}} - devstack - newton - {{isotime \"20060102-1504\"}}", - "source_image_name": "{{user `public_base_image`}}", + "image_name": "{{user `distro`}} - devstack-newton - {{isotime \"20060102-1504\"}}", + "source_image": "{{user `public_base_image`}}", "flavor": "general1-1", "networks": [ "{{user `public_network`}}" @@ -45,7 +43,7 @@ "username": "{{user `private_user`}}", "password": "{{user `private_pass`}}", "ssh_username": "{{user `private_cloud_user`}}", - "image_name": "{{user `distro`}} - devstack - newton - {{isotime \"20060102-1504\"}}", + "image_name": "{{user `distro`}} - devstack-newton - {{isotime \"20060102-1504\"}}", "source_image_name": "{{user `private_base_image`}}", "flavor": "general1-1", "networks": [ @@ -63,6 +61,7 @@ "scripts": [ "provision/baseline.sh", "provision/devstack-pre-pip.sh", + "provision/system_reseal_local_env.sh", "provision/system_reseal.sh" ], "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"