From c9da8786f645fe1abd62e1c2050ddeec6b8d88da Mon Sep 17 00:00:00 2001 From: Alvaro Miranda Aguilera Date: Thu, 29 Nov 2018 12:32:07 +0100 Subject: [PATCH 1/2] amazon-ebs update simple example update simple example to make it copy/paste works --- .../source/docs/builders/amazon-ebs.html.md | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/website/source/docs/builders/amazon-ebs.html.md b/website/source/docs/builders/amazon-ebs.html.md index dfb0e0ecc..f143073fb 100644 --- a/website/source/docs/builders/amazon-ebs.html.md +++ b/website/source/docs/builders/amazon-ebs.html.md @@ -549,14 +549,20 @@ run: ``` json { - "type": "amazon-ebs", - "access_key": "YOUR KEY HERE", - "secret_key": "YOUR SECRET KEY HERE", - "region": "us-east-1", - "source_ami": "ami-fce3c696", - "instance_type": "t2.micro", - "ssh_username": "ubuntu", - "ami_name": "packer-quick-start {{timestamp}}" + "variables": { + "aws_access_key": "{{env `AWS_ACCESS_KEY_ID`}}", + "aws_secret_access_key": "{{env `AWS_SECRET_ACCESS_KEY`}}" + }, + { + "type": "amazon-ebs", + "access_key": "{{user `aws_access_key`}}", + "secret_key": "{{user `aws_secret_access_key`}}", + "region": "us-east-1", + "source_ami": "ami-fce3c696", + "instance_type": "t2.micro", + "ssh_username": "ubuntu", + "ami_name": "packer-quick-start {{timestamp}}" + } } ``` From 180d7c587ad52a0b2f94026949eab1377add4c6d Mon Sep 17 00:00:00 2001 From: Alvaro Miranda Aguilera Date: Fri, 30 Nov 2018 01:16:25 +0100 Subject: [PATCH 2/2] Update amazon-ebs.html.md --- .../source/docs/builders/amazon-ebs.html.md | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/website/source/docs/builders/amazon-ebs.html.md b/website/source/docs/builders/amazon-ebs.html.md index f143073fb..c26d0a4f6 100644 --- a/website/source/docs/builders/amazon-ebs.html.md +++ b/website/source/docs/builders/amazon-ebs.html.md @@ -549,20 +549,22 @@ run: ``` json { - "variables": { - "aws_access_key": "{{env `AWS_ACCESS_KEY_ID`}}", - "aws_secret_access_key": "{{env `AWS_SECRET_ACCESS_KEY`}}" - }, + "variables": { + "aws_access_key": "{{env `AWS_ACCESS_KEY_ID`}}", + "aws_secret_key": "{{env `AWS_SECRET_ACCESS_KEY`}}" + }, + "builders": [ { - "type": "amazon-ebs", - "access_key": "{{user `aws_access_key`}}", - "secret_key": "{{user `aws_secret_access_key`}}", - "region": "us-east-1", - "source_ami": "ami-fce3c696", - "instance_type": "t2.micro", - "ssh_username": "ubuntu", - "ami_name": "packer-quick-start {{timestamp}}" + "type": "amazon-ebs", + "access_key": "{{user `aws_access_key`}}", + "secret_key": "{{user `aws_secret_key`}}", + "region": "us-east-1", + "source_ami": "ami-fce3c696", + "instance_type": "t2.micro", + "ssh_username": "ubuntu", + "ami_name": "packer_AWS {{timestamp}}" } + ] } ```