From bf9c67cf483331b9fbfc9fde41e72f3bd315017e Mon Sep 17 00:00:00 2001 From: Mike Ripley Date: Wed, 26 Dec 2018 15:37:09 -0500 Subject: [PATCH 1/4] Update VirtualBox.org documentation references VirtualBox documentation chapter numbers have changed, try to link the correct place. --- .../source/docs/builders/virtualbox-iso.html.md.erb | 10 +++++----- .../source/docs/builders/virtualbox-ovf.html.md.erb | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/website/source/docs/builders/virtualbox-iso.html.md.erb b/website/source/docs/builders/virtualbox-iso.html.md.erb index 2de4cd132..dac021aa6 100644 --- a/website/source/docs/builders/virtualbox-iso.html.md.erb +++ b/website/source/docs/builders/virtualbox-iso.html.md.erb @@ -102,7 +102,7 @@ builder. - `export_opts` (array of strings) - Additional options to pass to the [VBoxManage - export](https://www.virtualbox.org/manual/ch08.html#vboxmanage-export). This + export](https://www.virtualbox.org/manual/ch09.html#vboxmanage-export). This can be useful for passing product information to include in the resulting appliance file. Packer JSON configuration file example: @@ -121,9 +121,9 @@ builder. ``` A VirtualBox [VM - description](https://www.virtualbox.org/manual/ch08.html#idm3756) may - contain arbitrary strings; the GUI interprets HTML formatting. However, the - JSON format does not allow arbitrary newlines within a value. Add a + description](https://www.virtualbox.org/manual/ch09.html#vboxmanage-modifyvm-general) + may contain arbitrary strings; the GUI interprets HTML formatting. However, + the JSON format does not allow arbitrary newlines within a value. Add a multi-line description by preparing the string in the shell before the packer call like this (shell `>` continuation character snipped for easier copy & paste): @@ -411,7 +411,7 @@ directory of the SSH user. In order to perform extra customization of the virtual machine, a template can define extra calls to `VBoxManage` to perform. -[VBoxManage](https://www.virtualbox.org/manual/ch08.html) is the command-line +[VBoxManage](https://www.virtualbox.org/manual/ch09.html) is the command-line interface to VirtualBox where you can completely control VirtualBox. It can be used to do things such as set RAM, CPUs, etc. diff --git a/website/source/docs/builders/virtualbox-ovf.html.md.erb b/website/source/docs/builders/virtualbox-ovf.html.md.erb index 5981ad8cf..e03d47bf8 100644 --- a/website/source/docs/builders/virtualbox-ovf.html.md.erb +++ b/website/source/docs/builders/virtualbox-ovf.html.md.erb @@ -93,7 +93,7 @@ builder. - `export_opts` (array of strings) - Additional options to pass to the [VBoxManage - export](https://www.virtualbox.org/manual/ch08.html#vboxmanage-export). This + export](https://www.virtualbox.org/manual/ch09.html#vboxmanage-export). This can be useful for passing product information to include in the resulting appliance file. Packer JSON configuration file example: @@ -112,9 +112,9 @@ builder. ``` A VirtualBox [VM - description](https://www.virtualbox.org/manual/ch08.html#idm3756) may - contain arbitrary strings; the GUI interprets HTML formatting. However, the - JSON format does not allow arbitrary newlines within a value. Add a + description](https://www.virtualbox.org/manual/ch09.html#vboxmanage-modifyvm-general) + may contain arbitrary strings; the GUI interprets HTML formatting. However, + the JSON format does not allow arbitrary newlines within a value. Add a multi-line description by preparing the string in the shell before the packer call like this (shell `>` continuation character snipped for easier copy & paste): @@ -356,7 +356,7 @@ directory of the SSH user. In order to perform extra customization of the virtual machine, a template can define extra calls to `VBoxManage` to perform. -[VBoxManage](https://www.virtualbox.org/manual/ch08.html) is the command-line +[VBoxManage](https://www.virtualbox.org/manual/ch09.html) is the command-line interface to VirtualBox where you can completely control VirtualBox. It can be used to do things such as set RAM, CPUs, etc. From 490b11ba15c0e9003c51e0a0163171f110a648c5 Mon Sep 17 00:00:00 2001 From: Ladar Levison Date: Wed, 26 Dec 2018 22:25:58 -0600 Subject: [PATCH 2/4] Removed duplicate Azure, moved Docker entry. The Docker entry was last, but should have been 4th, since it appears this list is supposed to be alpha ordered. --- website/source/docs/post-processors/vagrant.html.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/website/source/docs/post-processors/vagrant.html.md b/website/source/docs/post-processors/vagrant.html.md index c06c11fc2..c0ccf6241 100644 --- a/website/source/docs/post-processors/vagrant.html.md +++ b/website/source/docs/post-processors/vagrant.html.md @@ -33,14 +33,13 @@ providers. - AWS - Azure - DigitalOcean -- Azure +- Docker - Hyper-V - LXC - Parallels - QEMU - VirtualBox - VMware -- Docker -> **Support for additional providers** is planned. If the Vagrant post-processor doesn't support creating boxes for a provider you care about, From 82aadb3fe20cbf0400ea8e070f9bc978199bda51 Mon Sep 17 00:00:00 2001 From: Megan Marsh Date: Thu, 3 Jan 2019 10:21:41 -0800 Subject: [PATCH 3/4] add note about ansible to chroot builder --- website/source/docs/builders/amazon-chroot.html.md | 5 +++++ website/source/docs/provisioners/ansible.html.md | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/website/source/docs/builders/amazon-chroot.html.md b/website/source/docs/builders/amazon-chroot.html.md index 6af73d0a5..24622e049 100644 --- a/website/source/docs/builders/amazon-chroot.html.md +++ b/website/source/docs/builders/amazon-chroot.html.md @@ -455,6 +455,11 @@ services: } ``` +### Ansible provisioner + +Running ansible against `amazon-chroot` requires changing the Ansible connection +to chroot and running Ansible as root/sudo. + ### Using Instances with NVMe block devices. In C5, C5d, M5, and i3.metal instances, EBS volumes are exposed as NVMe block diff --git a/website/source/docs/provisioners/ansible.html.md b/website/source/docs/provisioners/ansible.html.md index 04b7134f2..440215b8a 100644 --- a/website/source/docs/provisioners/ansible.html.md +++ b/website/source/docs/provisioners/ansible.html.md @@ -195,7 +195,7 @@ Redhat / CentOS builds have been known to fail with the following error due to ### chroot communicator Building within a chroot (e.g. `amazon-chroot`) requires changing the Ansible -connection to chroot. +connection to chroot and running Ansible as root/sudo. ``` json { From 8391a93ecc39e015d10bf6a209af776f30ca04b0 Mon Sep 17 00:00:00 2001 From: Mike Ripley Date: Thu, 3 Jan 2019 16:13:54 -0500 Subject: [PATCH 4/4] Fix VirtualBox HREFs Per feedback on PR 7152 --- website/source/docs/builders/virtualbox-iso.html.md.erb | 2 +- website/source/docs/builders/virtualbox-ovf.html.md.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/website/source/docs/builders/virtualbox-iso.html.md.erb b/website/source/docs/builders/virtualbox-iso.html.md.erb index dac021aa6..0f2926e7b 100644 --- a/website/source/docs/builders/virtualbox-iso.html.md.erb +++ b/website/source/docs/builders/virtualbox-iso.html.md.erb @@ -121,7 +121,7 @@ builder. ``` A VirtualBox [VM - description](https://www.virtualbox.org/manual/ch09.html#vboxmanage-modifyvm-general) + description](https://www.virtualbox.org/manual/ch09.html#vboxmanage-export-ovf) may contain arbitrary strings; the GUI interprets HTML formatting. However, the JSON format does not allow arbitrary newlines within a value. Add a multi-line description by preparing the string in the shell before the diff --git a/website/source/docs/builders/virtualbox-ovf.html.md.erb b/website/source/docs/builders/virtualbox-ovf.html.md.erb index e03d47bf8..d3ca4d7ae 100644 --- a/website/source/docs/builders/virtualbox-ovf.html.md.erb +++ b/website/source/docs/builders/virtualbox-ovf.html.md.erb @@ -112,7 +112,7 @@ builder. ``` A VirtualBox [VM - description](https://www.virtualbox.org/manual/ch09.html#vboxmanage-modifyvm-general) + description](https://www.virtualbox.org/manual/ch09.html#vboxmanage-export-ovf) may contain arbitrary strings; the GUI interprets HTML formatting. However, the JSON format does not allow arbitrary newlines within a value. Add a multi-line description by preparing the string in the shell before the