X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=packer%2Ftemplates%2Fmininet-ovs-2.6.json;h=7855df992427a54f02ef7a6c9c16872513d79dc2;hb=d2f7250526bc3abec6fd2cef5b39f837fcf2a703;hp=fa999a7f6f053f7883c97e5a3e79e1d9c697dea3;hpb=3ca15af3b33832496e76c9bdb95a08c9d8d936ef;p=releng%2Fbuilder.git diff --git a/packer/templates/mininet-ovs-2.6.json b/packer/templates/mininet-ovs-2.6.json index fa999a7f6..7855df992 100644 --- a/packer/templates/mininet-ovs-2.6.json +++ b/packer/templates/mininet-ovs-2.6.json @@ -6,7 +6,6 @@ "cloud_network": null, "cloud_user_data": null, "cloud_region": "ca-ymq-1", - "cloud_availability_zone": "ca-ymq-2", "vm_use_block_storage": "true", "vm_volume_size": "20", "vm_image_disk_format": "", @@ -23,7 +22,6 @@ "source_image_name": "{{user `base_image`}}", "type": "openstack", "region": "{{user `cloud_region`}}", - "availability_zone": "{{user `cloud_availability_zone`}}", "networks": ["{{user `cloud_network`}}"], "user_data_file": "{{user `cloud_user_data`}}", "ssh_username": "{{user `ssh_user`}}", @@ -40,9 +38,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" }, {