Merge pull request #2347 from grange74/master

#2346 updated to AMI that doesn't require accepting marketplace terms
This commit is contained in:
Mitchell Hashimoto 2015-06-29 09:22:51 -07:00
commit 41e160ccda
2 changed files with 2 additions and 2 deletions

View File

@ -54,7 +54,7 @@ briefly. Create a file `example.json` and fill it with the following contents:
"access_key": "{{user `aws_access_key`}}", "access_key": "{{user `aws_access_key`}}",
"secret_key": "{{user `aws_secret_key`}}", "secret_key": "{{user `aws_secret_key`}}",
"region": "us-east-1", "region": "us-east-1",
"source_ami": "ami-c65be9ae", "source_ami": "ami-de0d9eb7",
"instance_type": "t1.micro", "instance_type": "t1.micro",
"ssh_username": "ubuntu", "ssh_username": "ubuntu",
"ami_name": "packer-example {{timestamp}}" "ami_name": "packer-example {{timestamp}}"

View File

@ -93,7 +93,7 @@ The entire template should now look like this:
"access_key": "{{user `aws_access_key`}}", "access_key": "{{user `aws_access_key`}}",
"secret_key": "{{user `aws_secret_key`}}", "secret_key": "{{user `aws_secret_key`}}",
"region": "us-east-1", "region": "us-east-1",
"source_ami": "ami-c65be9ae", "source_ami": "ami-de0d9eb7",
"instance_type": "t1.micro", "instance_type": "t1.micro",
"ssh_username": "ubuntu", "ssh_username": "ubuntu",
"ami_name": "packer-example {{timestamp}}" "ami_name": "packer-example {{timestamp}}"