From ec01ffa91b5658f80be6b7756fffadf69fbe466e Mon Sep 17 00:00:00 2001 From: Rickard von Essen Date: Fri, 14 Jul 2017 07:58:45 +0200 Subject: [PATCH 1/5] cloudstack: Moved several settins to the optional section Moved `instance_name`, `template_name`, and `template_display_name` to the optional section since the have default values. --- .../source/docs/builders/cloudstack.html.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/website/source/docs/builders/cloudstack.html.md b/website/source/docs/builders/cloudstack.html.md index f6a5fa9dd..b986cc7f1 100644 --- a/website/source/docs/builders/cloudstack.html.md +++ b/website/source/docs/builders/cloudstack.html.md @@ -42,9 +42,6 @@ builder. connect to the instance. Usually this will be the NAT address of your current location. Only required when `use_local_ip_address` is `false`. -- `instance_name` (string) - The name of the instance. Defaults to - "packer-UUID" where UUID is dynamically generated. - - `network` (string) - The name or ID of the network to connect the instance to. @@ -59,12 +56,6 @@ builder. - `source_template` (string) - The name or ID of the template used as base template for the instance. This option is mutual explusive with `source_iso`. -- `template_name` (string) - The name of the new template. Defaults to - "packer-{{timestamp}}" where timestamp will be the current time. - -- `template_display_text` (string) - The display text of the new template. - Defaults to the `template_name`. - - `template_os` (string) - The name or ID of the template OS for the new template that will be created. @@ -111,6 +102,9 @@ builder. access the instance. The SSH key pair is assumed to be already available within CloudStack. +- `instance_name` (string) - The name of the instance. Defaults to + "packer-UUID" where UUID is dynamically generated. + - `project` (string) - The name or ID of the project to deploy the instance to. - `public_ip_address` (string) - The public IP address or it's ID used for @@ -120,9 +114,15 @@ builder. - `ssl_no_verify` (boolean) - Set to `true` to skip SSL verification. Defaults to `false`. +- `template_display_text` (string) - The display text of the new template. + Defaults to the `template_name`. + - `template_featured` (boolean) - Set to `true` to indicate that the template is featured. Defaults to `false`. +- `template_name` (string) - The name of the new template. Defaults to + "packer-{{timestamp}}" where timestamp will be the current time. + - `template_public` (boolean) - Set to `true` to indicate that the template is available for all accounts. Defaults to `false`. From e7320b526c7d4e7b24b965463ec5800a79ef5ab9 Mon Sep 17 00:00:00 2001 From: Rickard von Essen Date: Fri, 14 Jul 2017 08:06:04 +0200 Subject: [PATCH 2/5] cloudstack: Added missing `ssh_username` to the example --- website/source/docs/builders/cloudstack.html.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/website/source/docs/builders/cloudstack.html.md b/website/source/docs/builders/cloudstack.html.md index b986cc7f1..9248b3fe3 100644 --- a/website/source/docs/builders/cloudstack.html.md +++ b/website/source/docs/builders/cloudstack.html.md @@ -168,6 +168,8 @@ Here is a basic example. "source_iso": "CentOS-7.0-1406-x86_64-Minimal", "zone": "NL1", + "ssh_username": "root", + "template_name": "Centos7-x86_64-KVM-Packer", "template_display_text": "Centos7-x86_64 KVM Packer", "template_featured": true, From bc5f277faf7ea877bd6aff1cb5e958fe74211034 Mon Sep 17 00:00:00 2001 From: Rickard von Essen Date: Fri, 14 Jul 2017 09:33:41 +0200 Subject: [PATCH 3/5] cloudstack: add user_data_file to docs --- website/source/docs/builders/cloudstack.html.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/website/source/docs/builders/cloudstack.html.md b/website/source/docs/builders/cloudstack.html.md index 9248b3fe3..d33fb3763 100644 --- a/website/source/docs/builders/cloudstack.html.md +++ b/website/source/docs/builders/cloudstack.html.md @@ -135,7 +135,14 @@ builder. - `template_scalable` (boolean) - Set to `true` to indicate that the template contains tools to support dynamic scaling of VM cpu/memory. Defaults to `false`. -- `user_data` (string) - User data to launch with the instance. +- `user_data` (string) - User data to launch with the instance. This is a + [template engine](/docs/templates/engine.html) see _User Data_ bellow for more + details. + +- `user_data_file` (string) - Path to a file that will be used for the user + data when launching the instance. This file will be parsed as a + [template engine](/docs/templates/engine.html) see _User Data_ bellow for more + details. - `use_local_ip_address` (boolean) - Set to `true` to indicate that the provisioners should connect to the local IP address of the instance. @@ -147,7 +154,7 @@ The available variables are: - `HTTPIP` and `HTTPPort` - The IP and port, respectively of an HTTP server that is started serving the directory specified by the `http_directory` configuration parameter. If `http_directory` isn't specified, these will be - blank! + blank. ## Basic Example From a1a655bfd890859edd8eb868f31ecc6d5bcf7544 Mon Sep 17 00:00:00 2001 From: Rickard von Essen Date: Fri, 14 Jul 2017 09:42:34 +0200 Subject: [PATCH 4/5] cloudstack: add note to source_iso --- website/source/docs/builders/cloudstack.html.md | 1 + 1 file changed, 1 insertion(+) diff --git a/website/source/docs/builders/cloudstack.html.md b/website/source/docs/builders/cloudstack.html.md index d33fb3763..b5bacb715 100644 --- a/website/source/docs/builders/cloudstack.html.md +++ b/website/source/docs/builders/cloudstack.html.md @@ -52,6 +52,7 @@ builder. - `soure_iso` (string) - The name or ID of an ISO that will be mounted before booting the instance. This option is mutual exclusive with `source_template`. + When then is used `disk_offering` and `hypervisor` is required. - `source_template` (string) - The name or ID of the template used as base template for the instance. This option is mutual explusive with `source_iso`. From 291d9ccaf11948e6e6c50f1d78ac387c33c10d2c Mon Sep 17 00:00:00 2001 From: Rickard von Essen Date: Fri, 14 Jul 2017 16:01:08 +0200 Subject: [PATCH 5/5] Updated after review --- website/source/docs/builders/cloudstack.html.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/source/docs/builders/cloudstack.html.md b/website/source/docs/builders/cloudstack.html.md index b5bacb715..b172e89a0 100644 --- a/website/source/docs/builders/cloudstack.html.md +++ b/website/source/docs/builders/cloudstack.html.md @@ -50,9 +50,9 @@ builder. - `service_offering` (string) - The name or ID of the service offering used for the instance. -- `soure_iso` (string) - The name or ID of an ISO that will be mounted before +- `source_iso` (string) - The name or ID of an ISO that will be mounted before booting the instance. This option is mutual exclusive with `source_template`. - When then is used `disk_offering` and `hypervisor` is required. + When using `source_iso`, both `disk_offering` and `hypervisor` are required. - `source_template` (string) - The name or ID of the template used as base template for the instance. This option is mutual explusive with `source_iso`.