diff options
Diffstat (limited to 'vendor/github.com/mitchellh/packer/examples')
6 files changed, 8 insertions, 1 deletions
diff --git a/vendor/github.com/mitchellh/packer/examples/alicloud/basic/alicloud.json b/vendor/github.com/mitchellh/packer/examples/alicloud/basic/alicloud.json index d96cafa5..8f83262f 100644 --- a/vendor/github.com/mitchellh/packer/examples/alicloud/basic/alicloud.json +++ b/vendor/github.com/mitchellh/packer/examples/alicloud/basic/alicloud.json @@ -12,6 +12,7 @@ "source_image":"centos_7_2_64_40G_base_20170222.vhd", "ssh_username":"root", "instance_type":"ecs.n1.tiny", + "internet_charge_type":"PayByTraffic", "io_optimized":"true" }], "provisioners": [{ diff --git a/vendor/github.com/mitchellh/packer/examples/alicloud/basic/alicloud_windows.json b/vendor/github.com/mitchellh/packer/examples/alicloud/basic/alicloud_windows.json index 6a530ef3..9acb6267 100644 --- a/vendor/github.com/mitchellh/packer/examples/alicloud/basic/alicloud_windows.json +++ b/vendor/github.com/mitchellh/packer/examples/alicloud/basic/alicloud_windows.json @@ -12,6 +12,7 @@ "source_image":"win2008r2_64_ent_sp1_zh-cn_40G_alibase_20170622.vhd", "instance_type":"ecs.n1.tiny", "io_optimized":"true", + "internet_charge_type":"PayByTraffic", "image_force_delete":"true", "communicator": "winrm", "winrm_port": 5985, diff --git a/vendor/github.com/mitchellh/packer/examples/alicloud/basic/alicloud_with_data_disk.json b/vendor/github.com/mitchellh/packer/examples/alicloud/basic/alicloud_with_data_disk.json index 88412d98..31f10ab7 100644 --- a/vendor/github.com/mitchellh/packer/examples/alicloud/basic/alicloud_with_data_disk.json +++ b/vendor/github.com/mitchellh/packer/examples/alicloud/basic/alicloud_with_data_disk.json @@ -12,6 +12,7 @@ "source_image":"centos_7_2_64_40G_base_20170222.vhd", "ssh_username":"root", "instance_type":"ecs.n1.tiny", + "internet_charge_type":"PayByTraffic", "io_optimized":"true", "image_disk_mappings":[{"disk_name":"data1","disk_size":20},{"disk_name":"data1","disk_size":20,"disk_device":"/dev/xvdz"}] }], diff --git a/vendor/github.com/mitchellh/packer/examples/alicloud/chef/alicloud.json b/vendor/github.com/mitchellh/packer/examples/alicloud/chef/alicloud.json index c04e0600..aa108bac 100644 --- a/vendor/github.com/mitchellh/packer/examples/alicloud/chef/alicloud.json +++ b/vendor/github.com/mitchellh/packer/examples/alicloud/chef/alicloud.json @@ -14,6 +14,7 @@ "instance_type":"ecs.n1.medium", "io_optimized":"true", "image_force_delete":"true", + "internet_charge_type":"PayByTraffic", "ssh_password":"Test1234", "user_data_file":"examples/alicloud/chef/user_data.sh" }], diff --git a/vendor/github.com/mitchellh/packer/examples/alicloud/jenkins/alicloud.json b/vendor/github.com/mitchellh/packer/examples/alicloud/jenkins/alicloud.json index 481c39b0..f1f9e989 100644 --- a/vendor/github.com/mitchellh/packer/examples/alicloud/jenkins/alicloud.json +++ b/vendor/github.com/mitchellh/packer/examples/alicloud/jenkins/alicloud.json @@ -13,6 +13,7 @@ "ssh_username":"root", "instance_type":"ecs.n1.medium", "io_optimized":"true", + "internet_charge_type":"PayByTraffic", "image_force_delete":"true", "ssh_password":"Test12345" }], diff --git a/vendor/github.com/mitchellh/packer/examples/azure/windows_custom_image.json b/vendor/github.com/mitchellh/packer/examples/azure/windows_custom_image.json index b411555a..018ba34d 100644 --- a/vendor/github.com/mitchellh/packer/examples/azure/windows_custom_image.json +++ b/vendor/github.com/mitchellh/packer/examples/azure/windows_custom_image.json @@ -4,7 +4,8 @@ "client_secret": "{{env `ARM_CLIENT_SECRET`}}",
"resource_group": "{{env `ARM_RESOURCE_GROUP`}}",
"storage_account": "{{env `ARM_STORAGE_ACCOUNT`}}",
- "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}"
+ "subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}",
+ "object_id": "{{env `ARM_OJBECT_ID`}}"
},
"builders": [
{
@@ -15,6 +16,7 @@ "resource_group_name": "{{user `resource_group`}}",
"storage_account": "{{user `storage_account`}}",
"subscription_id": "{{user `subscription_id`}}",
+ "object_id": "{{user `object_id`}}",
"capture_container_name": "images",
"capture_name_prefix": "packer",
|