From abfd108fbb92d1de3c901e9a7f67c97ffc6cc9cd Mon Sep 17 00:00:00 2001 From: Brian Cervenka Date: Tue, 7 Feb 2017 17:28:26 -0800 Subject: [PATCH 1/2] Minor fix to the triton_machine provider. The docs referred to a `networks` option, which seems to be deprecated. Now, terraform seems to expect a list of maps, which will detail each network interface. --- .../docs/providers/triton/r/triton_machine.html.markdown | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/website/source/docs/providers/triton/r/triton_machine.html.markdown b/website/source/docs/providers/triton/r/triton_machine.html.markdown index 6164250d65..481ba860d6 100644 --- a/website/source/docs/providers/triton/r/triton_machine.html.markdown +++ b/website/source/docs/providers/triton/r/triton_machine.html.markdown @@ -44,8 +44,8 @@ The following arguments are supported: * `image` - (string, Required) The UUID of the image to provision. -* `networks` - (list of string) - A list of the IDs of the desired networks for the machine. +* `nic` - (list of maps, Optional) + A list of maps with details for each nic. `nic` block described below. * `firewall_enabled` - (boolean) Default: `false` Whether the cloud firewall should be enabled for this machine. @@ -62,6 +62,10 @@ The following arguments are supported: * `administrator_pw` - (string) The initial password for the Administrator user. Only used for Windows virtual machines. +The nested `nic` block supports the following: +* `network` - (string, Optional) + The network id to attach to the network interface. It will be hex, in the format: `xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx`. + ## Attribute Reference The following attributes are exported: From fcc930cb97b5a0a4fdb0fd507d986228bd765eb8 Mon Sep 17 00:00:00 2001 From: stack72 Date: Mon, 13 Feb 2017 18:10:06 +0000 Subject: [PATCH 2/2] provider/triton: Update to the triton machine docs for the list of nics --- .../docs/providers/triton/r/triton_machine.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/source/docs/providers/triton/r/triton_machine.html.markdown b/website/source/docs/providers/triton/r/triton_machine.html.markdown index 481ba860d6..cbabd4926d 100644 --- a/website/source/docs/providers/triton/r/triton_machine.html.markdown +++ b/website/source/docs/providers/triton/r/triton_machine.html.markdown @@ -44,8 +44,8 @@ The following arguments are supported: * `image` - (string, Required) The UUID of the image to provision. -* `nic` - (list of maps, Optional) - A list of maps with details for each nic. `nic` block described below. +* `nic` - (list of NIC blocks, Optional) + NICs associated with the machine. The fields allowed in a `NIC` block are defined below. * `firewall_enabled` - (boolean) Default: `false` Whether the cloud firewall should be enabled for this machine.