From 399431c00b502f633f34cdb0f7a2533b0bb9c80d Mon Sep 17 00:00:00 2001 From: Matthew Hooker Date: Fri, 2 Feb 2018 12:19:04 -0800 Subject: [PATCH] group oracle builders under a single heading. --- .../docs/builders/oracle-classic.html.md | 32 +++++++++---------- .../source/docs/builders/oracle-oci.html.md | 2 +- website/source/docs/builders/oracle.html.md | 22 +++++++++++++ website/source/layouts/docs.erb | 15 ++++++--- 4 files changed, 49 insertions(+), 22 deletions(-) create mode 100644 website/source/docs/builders/oracle.html.md diff --git a/website/source/docs/builders/oracle-classic.html.md b/website/source/docs/builders/oracle-classic.html.md index 0d9dc05b7..f8991b968 100644 --- a/website/source/docs/builders/oracle-classic.html.md +++ b/website/source/docs/builders/oracle-classic.html.md @@ -1,7 +1,7 @@ --- -description: +description: | The oracle-classic builder is able to create new custom images for use with Oracle - Compute Cloud. + Cloud Infrastructure Classic Compute. layout: docs page_title: 'Oracle Cloud Infrastructure Classic - Builders' sidebar_current: 'docs-builders-oracle-classic' @@ -25,7 +25,7 @@ to use it or delete it. ## Authorization -This builder authenticates API calls to Oracle Cloud Infrastructure Classic Compute using basic +This builder authenticates API calls to Oracle Cloud Infrastructure Classic Compute using basic authentication (user name and password). To read more, see the [authentication documentation](https://docs.oracle.com/en/cloud/iaas/compute-iaas-cloud/stcsa/Authentication.html) @@ -36,11 +36,11 @@ This builder currently only works with the SSH communicator. ### Required - - `api_endpoint` (string) - This is your custom API endpoint for sending - requests. Instructions for determining your API endpoint can be found + - `api_endpoint` (string) - This is your custom API endpoint for sending + requests. Instructions for determining your API endpoint can be found [here](https://docs.oracle.com/en/cloud/iaas/compute-iaas-cloud/stcsa/SendRequests.html) - - `dest_image_list` (string) - Where to save the machine image to once you've + - `dest_image_list` (string) - Where to save the machine image to once you've provisioned it. If the provided image list does not exist, Packer will create it. - `identity_domain` (string) - This is your customer-specific identity domain @@ -50,7 +50,7 @@ This builder currently only works with the SSH communicator. - `source_image_list` (string) - This is what image you want to use as your base image. See the [documentation](https://docs.oracle.com/en/cloud/iaas/compute-iaas-cloud/stcsg/listing-machine-images.html) - for more details. You may use either a public image list, or a private image list. To see what public image lists are available, you can use + for more details. You may use either a public image list, or a private image list. To see what public image lists are available, you can use the CLI, as described [here](https://docs.oracle.com/en/cloud/iaas/compute-iaas-cloud/stopc/image-lists-stclr-and-nmcli.html#GUID-DB7E75FE-F752-4FF7-AB70-3C8DCDFCA0FA) - `password` (string) - Your account password. @@ -63,21 +63,21 @@ This builder currently only works with the SSH communicator. ### Optional - - `image_description` (string) - a description for your destination - image list. If you don't provide one, Packer will provide a generic description. + - `image_description` (string) - a description for your destination + image list. If you don't provide one, Packer will provide a generic description. - - `ssh_username` (string) - The username that Packer will use to SSH into the - instance; defaults to `opc`, the default oracle user, which has sudo - priveliges. If you have already configured users on your machine, you may - prompt Packer to use one of those instead. For more detail, see the + - `ssh_username` (string) - The username that Packer will use to SSH into the + instance; defaults to `opc`, the default oracle user, which has sudo + priveliges. If you have already configured users on your machine, you may + prompt Packer to use one of those instead. For more detail, see the [documentation](https://docs.oracle.com/en/cloud/iaas/compute-iaas-cloud/stcsg/accessing-oracle-linux-instance-using-ssh.html). - `image_name` (string) - The name to assign to the resulting custom image. ## Basic Example -Here is a basic example. Note that account specific configuration has been -obfuscated; you will need to add a working `username`, `password`, +Here is a basic example. Note that account specific configuration has been +obfuscated; you will need to add a working `username`, `password`, `identity_domain`, and `api_endpoint` in order for the example to work. ``` {.json} @@ -90,7 +90,7 @@ obfuscated; you will need to add a working `username`, `password`, "identity_domain": "#######", "api_endpoint": "https://api-###.compute.###.oraclecloud.com/", "source_image_list": "/oracle/public/OL_7.2_UEKR4_x86_64", - "shape": "oc3", + "shape": "oc3", "image_name": "Packer_Builder_Test_{{timestamp}}" "dest_image_list": "Packer_Builder_Test_List" } diff --git a/website/source/docs/builders/oracle-oci.html.md b/website/source/docs/builders/oracle-oci.html.md index 3503d4fca..6271c5830 100644 --- a/website/source/docs/builders/oracle-oci.html.md +++ b/website/source/docs/builders/oracle-oci.html.md @@ -1,5 +1,5 @@ --- -description: +description: | The oracle-oci builder is able to create new custom images for use with Oracle Cloud Infrastructure (OCI). layout: docs diff --git a/website/source/docs/builders/oracle.html.md b/website/source/docs/builders/oracle.html.md new file mode 100644 index 000000000..70a1917d0 --- /dev/null +++ b/website/source/docs/builders/oracle.html.md @@ -0,0 +1,22 @@ +--- +description: | + Packer is able to create custom images using Oracle Cloud Infrastructure. +layout: docs +page_title: 'Oracle - Builders' +sidebar_current: 'docs-builders-oracle' +--- + +# Oracle Builder + +Packer is able to create custom images on both Oracle Cloud Infrastructure and +Oracle Cloud Infrastructure Classic Compute. Packer comes with builders +designed to support both platforms. Please choose the one that's right for you: + +- [oracle-classic](/docs/builders/oracle-classic.html) - Create custom images + in Oracle Cloud Infrastructure Classic Compute by launching a source + instance and creating an image list from a snapshot of it after + provisioning. + +- [oracle-oci](/docs/builders/amazon-instance.html) - Create custom images in + Oracle Cloud Infrastructure (OCI) by launching a base instance and creating + an image from it after provisioning. diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb index 739b33733..8470e0d35 100644 --- a/website/source/layouts/docs.erb +++ b/website/source/layouts/docs.erb @@ -131,11 +131,16 @@ > OpenStack - > - Oracle Classic - - > - Oracle OCI + > + Oracle + > Parallels