From d2ae36214a84111314e053e527bca215a8e25b54 Mon Sep 17 00:00:00 2001 From: James Nugent Date: Wed, 26 Apr 2017 15:20:44 -0700 Subject: [PATCH 1/2] builder/triton: Reconcile #4829 and #4838 docs This changes the default region to match the default from Joyent documentation. --- builder/triton/access_config.go | 2 +- website/source/docs/builders/triton.html.md | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/builder/triton/access_config.go b/builder/triton/access_config.go index 4cb8e04cd..0f4d29e12 100644 --- a/builder/triton/access_config.go +++ b/builder/triton/access_config.go @@ -29,7 +29,7 @@ func (c *AccessConfig) Prepare(ctx *interpolate.Context) []error { if c.Endpoint == "" { // Use Joyent public cloud as the default endpoint if none is specified - c.Endpoint = "https://us-east-1.api.joyent.com" + c.Endpoint = "https://us-sw-1.api.joyent.com" } if c.Account == "" { diff --git a/website/source/docs/builders/triton.html.md b/website/source/docs/builders/triton.html.md index 7b369ee1c..b77064750 100644 --- a/website/source/docs/builders/triton.html.md +++ b/website/source/docs/builders/triton.html.md @@ -76,9 +76,9 @@ builder. ### Optional: - `triton_url` (string) - The URL of the Triton cloud API to use. If omitted - it will default to the URL of the Joyent Public cloud. If you are using your - own private Triton installation you will have to supply the URL of the cloud - API of your own Triton installation. + it will default to the `us-sw-1` region of the Joyent Public cloud. If + you are using your own private Triton installation you will have to supply + the URL of the cloud API of your own Triton installation. - `triton_key_material` (string) - Path to the file in which the private key of `triton_key_id` is stored. For example `~/.ssh/id_rsa`. If this is not @@ -141,14 +141,13 @@ cloud: "triton_key_id": "6b:95:03:3d:d3:6e:52:69:01:96:1a:46:4a:8d:c1:7e", "source_machine_name": "image-builder", - "source_machine_package": "g3-standard-0.5-smartos", - "source_machine_image": "70e3ae72-96b6-11e6-9056-9737fd4d0764", + "source_machine_package": "g4-highcpu-128M", + "source_machine_image": "f6acf198-2037-11e7-8863-8fdd4ce58b6a", "ssh_username": "root", - "ssh_private_key_file": "~/.ssh/id_rsa", "image_name": "my_new_image", - "image_version": "1.0.0", + "image_version": "1.0.0" } ] } @@ -160,3 +159,9 @@ started) are the same. This is because Triton automatically configures the root users to be able to login via SSH with the same key used to create the VM via the Cloud API. In more advanced scenarios for example when using a `source_machine_image` one might use different credentials. + +Available `triton_key_id`, `source_machine_package`, `source_machine_image`, and +`source_machine_networks` can be found by using the following +[Triton CLI](https://docs.joyent.com/public-cloud/api-access/cloudapi) +commands: `triton key list`, `triton package list`, `triton image list`, and +`triton network list` respectively. From 8e277b0ad3a6de0f412635b1049ee861c116cbf5 Mon Sep 17 00:00:00 2001 From: Matthew Hooker Date: Wed, 26 Apr 2017 15:54:18 -0700 Subject: [PATCH 2/2] remove tilde expansion --- website/source/docs/builders/triton.html.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/source/docs/builders/triton.html.md b/website/source/docs/builders/triton.html.md index b77064750..c7a0c1f26 100644 --- a/website/source/docs/builders/triton.html.md +++ b/website/source/docs/builders/triton.html.md @@ -81,9 +81,9 @@ builder. the URL of the cloud API of your own Triton installation. - `triton_key_material` (string) - Path to the file in which the private key - of `triton_key_id` is stored. For example `~/.ssh/id_rsa`. If this is not - specified, the SSH agent is used to sign requests with the `triton_key_id` - specified. + of `triton_key_id` is stored. For example `/home/soandso/.ssh/id_rsa`. If + this is not specified, the SSH agent is used to sign requests with the + `triton_key_id` specified. - `source_machine_firewall_enabled` (boolean) - Whether or not the firewall of the VM used to create an image of is enabled. The Triton firewall only