From 88e03280b695e5db097bbccb6dba3d4e92274b13 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Mon, 9 Nov 2020 03:17:41 -0800 Subject: [PATCH] Extract plugin-specific examples to plugin directories (#10228) * move alicloud examples from common example directory to alicloud builder * move amazon examples to amazon builder dir * move examples into ansible provisioner directory * move azure examples to builder dir * move hyperone examples into builder directory * move jdcloud builder examples into builder directory * move tencent cloud examples into the builder directory * move ucloud examples into ucloud builder directory --- .../alicloud/examples}/basic/alicloud.json | 0 .../alicloud/examples}/basic/alicloud_windows.json | 0 .../examples}/basic/alicloud_with_data_disk.json | 0 .../alicloud/examples}/basic/winrm_enable_userdata.ps1 | 0 .../alicloud/examples}/chef/alicloud.json | 0 .../alicloud => builder/alicloud/examples}/chef/chef.sh | 0 .../alicloud/examples}/chef/user_data.sh | 0 .../alicloud/examples}/jenkins/alicloud.json | 0 .../alicloud/examples}/jenkins/jenkins.sh | 0 .../alicloud/examples}/local/centos.json | 0 .../alicloud/examples}/local/http/centos-6.8/ks.cfg | 0 .../amazon/examples}/apache_server/README.Md | 0 .../amazon/examples}/apache_server/apache.json | 9 +++------ .../amazon/examples}/apache_server/packages.sh | 0 .../amazon/examples}/nginx_server/README.Md | 0 .../amazon/examples}/nginx_server/nginx.json | 0 .../amazon/examples}/nginx_server/packages.sh | 0 {examples/azure => builder/azure/examples}/centos.json | 0 .../azure => builder/azure/examples}/debian-chroot.json | 0 {examples/azure => builder/azure/examples}/debian.json | 0 .../azure => builder/azure/examples}/freebsd-chroot.json | 0 {examples/azure => builder/azure/examples}/freebsd.json | 0 .../azure/examples}/linux_custom_image.json | 0 .../azure/examples}/linux_custom_managed_image.json | 0 .../azure/examples}/marketplace_plan_info.json | 0 {examples/azure => builder/azure/examples}/rhel.json | 0 {examples/azure => builder/azure/examples}/suse.json | 0 .../azure => builder/azure/examples}/ubuntu-chroot.json | 0 {examples/azure => builder/azure/examples}/ubuntu.json | 0 .../azure/examples}/ubuntu_managed_image_sig.json | 0 .../azure/examples}/ubuntu_quickstart.json | 0 {examples/azure => builder/azure/examples}/windows.json | 0 .../azure/examples}/windows_custom_image.json | 0 .../azure/examples}/windows_quickstart.json | 0 .../hyperone => builder/hyperone/examples}/basic.json | 0 .../hyperone => builder/hyperone/examples}/chroot.json | 0 .../hyperone/examples}/new-syntax.pkr.hcl | 0 .../jdcloud/examples}/credential-key.json | 0 .../jdcloud/examples}/credential-new-key.json | 0 .../jdcloud/examples}/credential-password.json | 0 .../jdcloud/examples}/use_new_subnet.json | 0 .../tencentcloud/examples}/basic-with-data-disk.json | 0 .../tencentcloud/examples}/basic.json | 0 .../tencentcloud/examples}/centos.json | 0 {examples/ucloud => builder/ucloud/examples}/basic.json | 0 .../ucloud/examples}/local/http/centos-6.10/ks.cfg | 0 .../ucloud => builder/ucloud/examples}/local/local.json | 0 {examples/ucloud => builder/ucloud/examples}/ubuntu.json | 0 .../ansible/examples}/connection-plugin/2.4.x/packer.py | 0 .../ansible/examples}/connection-plugin/2.5.x/packer.py | 0 .../ansible/examples}/connection-plugin/2.6.x/packer.py | 0 51 files changed, 3 insertions(+), 6 deletions(-) rename {examples/alicloud => builder/alicloud/examples}/basic/alicloud.json (100%) rename {examples/alicloud => builder/alicloud/examples}/basic/alicloud_windows.json (100%) rename {examples/alicloud => builder/alicloud/examples}/basic/alicloud_with_data_disk.json (100%) rename {examples/alicloud => builder/alicloud/examples}/basic/winrm_enable_userdata.ps1 (100%) rename {examples/alicloud => builder/alicloud/examples}/chef/alicloud.json (100%) rename {examples/alicloud => builder/alicloud/examples}/chef/chef.sh (100%) rename {examples/alicloud => builder/alicloud/examples}/chef/user_data.sh (100%) rename {examples/alicloud => builder/alicloud/examples}/jenkins/alicloud.json (100%) rename {examples/alicloud => builder/alicloud/examples}/jenkins/jenkins.sh (100%) rename {examples/alicloud => builder/alicloud/examples}/local/centos.json (100%) rename {examples/alicloud => builder/alicloud/examples}/local/http/centos-6.8/ks.cfg (100%) rename {examples/amazon => builder/amazon/examples}/apache_server/README.Md (100%) rename {examples/amazon => builder/amazon/examples}/apache_server/apache.json (95%) rename {examples/amazon => builder/amazon/examples}/apache_server/packages.sh (100%) rename {examples/amazon => builder/amazon/examples}/nginx_server/README.Md (100%) rename {examples/amazon => builder/amazon/examples}/nginx_server/nginx.json (100%) rename {examples/amazon => builder/amazon/examples}/nginx_server/packages.sh (100%) rename {examples/azure => builder/azure/examples}/centos.json (100%) rename {examples/azure => builder/azure/examples}/debian-chroot.json (100%) rename {examples/azure => builder/azure/examples}/debian.json (100%) rename {examples/azure => builder/azure/examples}/freebsd-chroot.json (100%) rename {examples/azure => builder/azure/examples}/freebsd.json (100%) rename {examples/azure => builder/azure/examples}/linux_custom_image.json (100%) rename {examples/azure => builder/azure/examples}/linux_custom_managed_image.json (100%) rename {examples/azure => builder/azure/examples}/marketplace_plan_info.json (100%) rename {examples/azure => builder/azure/examples}/rhel.json (100%) rename {examples/azure => builder/azure/examples}/suse.json (100%) rename {examples/azure => builder/azure/examples}/ubuntu-chroot.json (100%) rename {examples/azure => builder/azure/examples}/ubuntu.json (100%) rename {examples/azure => builder/azure/examples}/ubuntu_managed_image_sig.json (100%) rename {examples/azure => builder/azure/examples}/ubuntu_quickstart.json (100%) rename {examples/azure => builder/azure/examples}/windows.json (100%) rename {examples/azure => builder/azure/examples}/windows_custom_image.json (100%) rename {examples/azure => builder/azure/examples}/windows_quickstart.json (100%) rename {examples/hyperone => builder/hyperone/examples}/basic.json (100%) rename {examples/hyperone => builder/hyperone/examples}/chroot.json (100%) rename {examples/hyperone => builder/hyperone/examples}/new-syntax.pkr.hcl (100%) rename {examples/jdcloud => builder/jdcloud/examples}/credential-key.json (100%) rename {examples/jdcloud => builder/jdcloud/examples}/credential-new-key.json (100%) rename {examples/jdcloud => builder/jdcloud/examples}/credential-password.json (100%) rename {examples/jdcloud => builder/jdcloud/examples}/use_new_subnet.json (100%) rename {examples/tencentcloud => builder/tencentcloud/examples}/basic-with-data-disk.json (100%) rename {examples/tencentcloud => builder/tencentcloud/examples}/basic.json (100%) rename {examples/tencentcloud => builder/tencentcloud/examples}/centos.json (100%) rename {examples/ucloud => builder/ucloud/examples}/basic.json (100%) rename {examples/ucloud => builder/ucloud/examples}/local/http/centos-6.10/ks.cfg (100%) rename {examples/ucloud => builder/ucloud/examples}/local/local.json (100%) rename {examples/ucloud => builder/ucloud/examples}/ubuntu.json (100%) rename {examples/ansible => provisioner/ansible/examples}/connection-plugin/2.4.x/packer.py (100%) rename {examples/ansible => provisioner/ansible/examples}/connection-plugin/2.5.x/packer.py (100%) rename {examples/ansible => provisioner/ansible/examples}/connection-plugin/2.6.x/packer.py (100%) diff --git a/examples/alicloud/basic/alicloud.json b/builder/alicloud/examples/basic/alicloud.json similarity index 100% rename from examples/alicloud/basic/alicloud.json rename to builder/alicloud/examples/basic/alicloud.json diff --git a/examples/alicloud/basic/alicloud_windows.json b/builder/alicloud/examples/basic/alicloud_windows.json similarity index 100% rename from examples/alicloud/basic/alicloud_windows.json rename to builder/alicloud/examples/basic/alicloud_windows.json diff --git a/examples/alicloud/basic/alicloud_with_data_disk.json b/builder/alicloud/examples/basic/alicloud_with_data_disk.json similarity index 100% rename from examples/alicloud/basic/alicloud_with_data_disk.json rename to builder/alicloud/examples/basic/alicloud_with_data_disk.json diff --git a/examples/alicloud/basic/winrm_enable_userdata.ps1 b/builder/alicloud/examples/basic/winrm_enable_userdata.ps1 similarity index 100% rename from examples/alicloud/basic/winrm_enable_userdata.ps1 rename to builder/alicloud/examples/basic/winrm_enable_userdata.ps1 diff --git a/examples/alicloud/chef/alicloud.json b/builder/alicloud/examples/chef/alicloud.json similarity index 100% rename from examples/alicloud/chef/alicloud.json rename to builder/alicloud/examples/chef/alicloud.json diff --git a/examples/alicloud/chef/chef.sh b/builder/alicloud/examples/chef/chef.sh similarity index 100% rename from examples/alicloud/chef/chef.sh rename to builder/alicloud/examples/chef/chef.sh diff --git a/examples/alicloud/chef/user_data.sh b/builder/alicloud/examples/chef/user_data.sh similarity index 100% rename from examples/alicloud/chef/user_data.sh rename to builder/alicloud/examples/chef/user_data.sh diff --git a/examples/alicloud/jenkins/alicloud.json b/builder/alicloud/examples/jenkins/alicloud.json similarity index 100% rename from examples/alicloud/jenkins/alicloud.json rename to builder/alicloud/examples/jenkins/alicloud.json diff --git a/examples/alicloud/jenkins/jenkins.sh b/builder/alicloud/examples/jenkins/jenkins.sh similarity index 100% rename from examples/alicloud/jenkins/jenkins.sh rename to builder/alicloud/examples/jenkins/jenkins.sh diff --git a/examples/alicloud/local/centos.json b/builder/alicloud/examples/local/centos.json similarity index 100% rename from examples/alicloud/local/centos.json rename to builder/alicloud/examples/local/centos.json diff --git a/examples/alicloud/local/http/centos-6.8/ks.cfg b/builder/alicloud/examples/local/http/centos-6.8/ks.cfg similarity index 100% rename from examples/alicloud/local/http/centos-6.8/ks.cfg rename to builder/alicloud/examples/local/http/centos-6.8/ks.cfg diff --git a/examples/amazon/apache_server/README.Md b/builder/amazon/examples/apache_server/README.Md similarity index 100% rename from examples/amazon/apache_server/README.Md rename to builder/amazon/examples/apache_server/README.Md diff --git a/examples/amazon/apache_server/apache.json b/builder/amazon/examples/apache_server/apache.json similarity index 95% rename from examples/amazon/apache_server/apache.json rename to builder/amazon/examples/apache_server/apache.json index 331f21138..ddba2e18e 100644 --- a/examples/amazon/apache_server/apache.json +++ b/builder/amazon/examples/apache_server/apache.json @@ -1,7 +1,4 @@ - - - -{ +{ "variables": { "accesskey": "", @@ -22,13 +19,13 @@ "OS_Version": "Ubuntu", "Release": "Latest" } - } + } ], "provisioners":[ { "type": "shell", "script": "{{user `shellpath`}}" - } + } ] } diff --git a/examples/amazon/apache_server/packages.sh b/builder/amazon/examples/apache_server/packages.sh similarity index 100% rename from examples/amazon/apache_server/packages.sh rename to builder/amazon/examples/apache_server/packages.sh diff --git a/examples/amazon/nginx_server/README.Md b/builder/amazon/examples/nginx_server/README.Md similarity index 100% rename from examples/amazon/nginx_server/README.Md rename to builder/amazon/examples/nginx_server/README.Md diff --git a/examples/amazon/nginx_server/nginx.json b/builder/amazon/examples/nginx_server/nginx.json similarity index 100% rename from examples/amazon/nginx_server/nginx.json rename to builder/amazon/examples/nginx_server/nginx.json diff --git a/examples/amazon/nginx_server/packages.sh b/builder/amazon/examples/nginx_server/packages.sh similarity index 100% rename from examples/amazon/nginx_server/packages.sh rename to builder/amazon/examples/nginx_server/packages.sh diff --git a/examples/azure/centos.json b/builder/azure/examples/centos.json similarity index 100% rename from examples/azure/centos.json rename to builder/azure/examples/centos.json diff --git a/examples/azure/debian-chroot.json b/builder/azure/examples/debian-chroot.json similarity index 100% rename from examples/azure/debian-chroot.json rename to builder/azure/examples/debian-chroot.json diff --git a/examples/azure/debian.json b/builder/azure/examples/debian.json similarity index 100% rename from examples/azure/debian.json rename to builder/azure/examples/debian.json diff --git a/examples/azure/freebsd-chroot.json b/builder/azure/examples/freebsd-chroot.json similarity index 100% rename from examples/azure/freebsd-chroot.json rename to builder/azure/examples/freebsd-chroot.json diff --git a/examples/azure/freebsd.json b/builder/azure/examples/freebsd.json similarity index 100% rename from examples/azure/freebsd.json rename to builder/azure/examples/freebsd.json diff --git a/examples/azure/linux_custom_image.json b/builder/azure/examples/linux_custom_image.json similarity index 100% rename from examples/azure/linux_custom_image.json rename to builder/azure/examples/linux_custom_image.json diff --git a/examples/azure/linux_custom_managed_image.json b/builder/azure/examples/linux_custom_managed_image.json similarity index 100% rename from examples/azure/linux_custom_managed_image.json rename to builder/azure/examples/linux_custom_managed_image.json diff --git a/examples/azure/marketplace_plan_info.json b/builder/azure/examples/marketplace_plan_info.json similarity index 100% rename from examples/azure/marketplace_plan_info.json rename to builder/azure/examples/marketplace_plan_info.json diff --git a/examples/azure/rhel.json b/builder/azure/examples/rhel.json similarity index 100% rename from examples/azure/rhel.json rename to builder/azure/examples/rhel.json diff --git a/examples/azure/suse.json b/builder/azure/examples/suse.json similarity index 100% rename from examples/azure/suse.json rename to builder/azure/examples/suse.json diff --git a/examples/azure/ubuntu-chroot.json b/builder/azure/examples/ubuntu-chroot.json similarity index 100% rename from examples/azure/ubuntu-chroot.json rename to builder/azure/examples/ubuntu-chroot.json diff --git a/examples/azure/ubuntu.json b/builder/azure/examples/ubuntu.json similarity index 100% rename from examples/azure/ubuntu.json rename to builder/azure/examples/ubuntu.json diff --git a/examples/azure/ubuntu_managed_image_sig.json b/builder/azure/examples/ubuntu_managed_image_sig.json similarity index 100% rename from examples/azure/ubuntu_managed_image_sig.json rename to builder/azure/examples/ubuntu_managed_image_sig.json diff --git a/examples/azure/ubuntu_quickstart.json b/builder/azure/examples/ubuntu_quickstart.json similarity index 100% rename from examples/azure/ubuntu_quickstart.json rename to builder/azure/examples/ubuntu_quickstart.json diff --git a/examples/azure/windows.json b/builder/azure/examples/windows.json similarity index 100% rename from examples/azure/windows.json rename to builder/azure/examples/windows.json diff --git a/examples/azure/windows_custom_image.json b/builder/azure/examples/windows_custom_image.json similarity index 100% rename from examples/azure/windows_custom_image.json rename to builder/azure/examples/windows_custom_image.json diff --git a/examples/azure/windows_quickstart.json b/builder/azure/examples/windows_quickstart.json similarity index 100% rename from examples/azure/windows_quickstart.json rename to builder/azure/examples/windows_quickstart.json diff --git a/examples/hyperone/basic.json b/builder/hyperone/examples/basic.json similarity index 100% rename from examples/hyperone/basic.json rename to builder/hyperone/examples/basic.json diff --git a/examples/hyperone/chroot.json b/builder/hyperone/examples/chroot.json similarity index 100% rename from examples/hyperone/chroot.json rename to builder/hyperone/examples/chroot.json diff --git a/examples/hyperone/new-syntax.pkr.hcl b/builder/hyperone/examples/new-syntax.pkr.hcl similarity index 100% rename from examples/hyperone/new-syntax.pkr.hcl rename to builder/hyperone/examples/new-syntax.pkr.hcl diff --git a/examples/jdcloud/credential-key.json b/builder/jdcloud/examples/credential-key.json similarity index 100% rename from examples/jdcloud/credential-key.json rename to builder/jdcloud/examples/credential-key.json diff --git a/examples/jdcloud/credential-new-key.json b/builder/jdcloud/examples/credential-new-key.json similarity index 100% rename from examples/jdcloud/credential-new-key.json rename to builder/jdcloud/examples/credential-new-key.json diff --git a/examples/jdcloud/credential-password.json b/builder/jdcloud/examples/credential-password.json similarity index 100% rename from examples/jdcloud/credential-password.json rename to builder/jdcloud/examples/credential-password.json diff --git a/examples/jdcloud/use_new_subnet.json b/builder/jdcloud/examples/use_new_subnet.json similarity index 100% rename from examples/jdcloud/use_new_subnet.json rename to builder/jdcloud/examples/use_new_subnet.json diff --git a/examples/tencentcloud/basic-with-data-disk.json b/builder/tencentcloud/examples/basic-with-data-disk.json similarity index 100% rename from examples/tencentcloud/basic-with-data-disk.json rename to builder/tencentcloud/examples/basic-with-data-disk.json diff --git a/examples/tencentcloud/basic.json b/builder/tencentcloud/examples/basic.json similarity index 100% rename from examples/tencentcloud/basic.json rename to builder/tencentcloud/examples/basic.json diff --git a/examples/tencentcloud/centos.json b/builder/tencentcloud/examples/centos.json similarity index 100% rename from examples/tencentcloud/centos.json rename to builder/tencentcloud/examples/centos.json diff --git a/examples/ucloud/basic.json b/builder/ucloud/examples/basic.json similarity index 100% rename from examples/ucloud/basic.json rename to builder/ucloud/examples/basic.json diff --git a/examples/ucloud/local/http/centos-6.10/ks.cfg b/builder/ucloud/examples/local/http/centos-6.10/ks.cfg similarity index 100% rename from examples/ucloud/local/http/centos-6.10/ks.cfg rename to builder/ucloud/examples/local/http/centos-6.10/ks.cfg diff --git a/examples/ucloud/local/local.json b/builder/ucloud/examples/local/local.json similarity index 100% rename from examples/ucloud/local/local.json rename to builder/ucloud/examples/local/local.json diff --git a/examples/ucloud/ubuntu.json b/builder/ucloud/examples/ubuntu.json similarity index 100% rename from examples/ucloud/ubuntu.json rename to builder/ucloud/examples/ubuntu.json diff --git a/examples/ansible/connection-plugin/2.4.x/packer.py b/provisioner/ansible/examples/connection-plugin/2.4.x/packer.py similarity index 100% rename from examples/ansible/connection-plugin/2.4.x/packer.py rename to provisioner/ansible/examples/connection-plugin/2.4.x/packer.py diff --git a/examples/ansible/connection-plugin/2.5.x/packer.py b/provisioner/ansible/examples/connection-plugin/2.5.x/packer.py similarity index 100% rename from examples/ansible/connection-plugin/2.5.x/packer.py rename to provisioner/ansible/examples/connection-plugin/2.5.x/packer.py diff --git a/examples/ansible/connection-plugin/2.6.x/packer.py b/provisioner/ansible/examples/connection-plugin/2.6.x/packer.py similarity index 100% rename from examples/ansible/connection-plugin/2.6.x/packer.py rename to provisioner/ansible/examples/connection-plugin/2.6.x/packer.py