X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=packer%2Ftemplates%2Fbaseline.json;h=86fee0358220dd7ec92b37ffb85a4315f3df47c8;hb=9b46087a28de418cf2e0ce5d366346dc9adc3a10;hp=d0d304fe0cece9fe4fc8ab345398640eb590c942;hpb=4fe946ab377d9063e5cc214a1104c1d2a1525c1c;p=releng%2Fbuilder.git diff --git a/packer/templates/baseline.json b/packer/templates/baseline.json index d0d304fe0..86fee0358 100644 --- a/packer/templates/baseline.json +++ b/packer/templates/baseline.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 }, @@ -30,7 +28,7 @@ "region": "DFW", "ssh_username": "{{user `public_cloud_user`}}", "image_name": "{{user `distro`}} - baseline - {{isotime \"20060102-1504\"}}", - "source_image_name": "{{user `public_base_image`}}", + "source_image": "{{user `public_base_image`}}", "flavor": "general1-1", "networks": [ "{{user `public_network`}}" @@ -59,6 +57,7 @@ "type": "shell", "scripts": [ "provision/baseline.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"