iSharkFly-Docs/packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,376 Commits 40 Branches 99 Tags
Commit Graph

850 Commits

Author SHA1 Message Date
Matthew Hooker
e54605c120
Properly wait for security group to exist. 
Adds check for `InvalidGroupID.NotFound` in addition to
`InvalidSecurityGroupID.NotFound`.

Uses aws's `waiter` for clarity.
 2017-01-05 15:20:28 -08:00
Matthew Hooker
aef6e0e93f Merge pull request #4304 from dave2/gh-4277 
Querying EC2 security groups should report unexpected errors
 2017-01-04 10:53:28 -08:00
Travis Harrington
e31d75eca8 Quick fix for issue #4340 2016-12-29 09:16:52 -07:00
Rickard von Essen
4b1e014be8
builder/amazon: Crashes when multiple EBS vols are used 
If you use a new EBS vol (which hasn't any snapshot) Packer crashes when
creating the AMI.

Closes #4303
 2016-12-21 15:37:08 +01:00
Zanetti, David
ae5730c5a5 Querying EC2 security groups should report unexpected errors 
As noted in #4277, we don't report any errors from the loop waiting for
a security group to exist. Instead, we should accept 'errors' which result
from the group not yet existing, and report errors which are actual issues
the user needs to resolve (eg, IAM permissions are incorrect).

Closes #4277
 2016-12-21 11:45:12 +13:00
Matthew Hooker
e4f6eaae9b Merge pull request #4231 from artburkart/force-delete-snapshot-patch 
Fixes acceptance test for PR #4223
 2016-12-17 11:43:26 -08:00
Rickard von Essen
d3c2239b9e
builder/amazon: Change shutdown_behaviour to shutdown_behavior 2016-12-14 21:59:16 +01:00
Rickard von Essen
c24b4423b2 builder/amazon: Added new region London - eu-west-2 2016-12-14 10:55:19 +01:00
Alexander Krasnukhin
ac98aad1df Fix log statement 2016-12-13 12:53:03 +01:00
Matthew Hooker
f1fb942219
add ca-central-1 to list of known aws regions. 
resolves #4273
 2016-12-09 11:21:44 -08:00
Rickard von Essen
5c4d331a34 Added missing LaunchPermission 2016-12-06 09:59:09 +01:00
Rickard von Essen
4ce3b8712a
Replace unencrypted EBS snapshots with encrypted 
To ensure that groups and users attributes are added to the encrypted
snapshots.
 2016-12-06 03:31:09 +01:00
Rickard von Essen
c3a352955e amazon: Added snapshot_users and snapshot_groups 2016-12-04 16:03:01 +01:00
Ari Aviran
46f217f255 amazon - Snapshot permissions correctly applied 
Fixes #3344
 2016-12-04 16:03:01 +01:00
Rickard von Essen
d7a7d8c852
It's not possible to share encrypted AMI's 2016-12-04 15:52:23 +01:00
poida
8b13b75097 Updated documentation and error messages 
The docs for kms_key_id needed to be next to encrypt_boot.

Shortened some of the kms_key_id error messages.
 2016-12-03 07:49:54 +11:00
poida
7ea17e1630 Allow custom encrypted AMIs to be shared 
When using a custom KMS key to encrypt the boot volume of an AMI, packer should allow it to be shared with other users.
 2016-12-03 07:49:54 +11:00
poida
3eed6fd508 Added KMS CMK support to EBS builder 
Added the 'kms_key_id' parameter. This supports supplying a customer master key (CMK) when encrypting the EBS volume.

The parameter is optional and only takes effect when 'encrypted' is true. When 'encrypted' is true but 'kms_key_id' is missing the 'aws/ebs' key will be used.
 2016-12-03 07:49:34 +11:00
Rickard von Essen
8d2ceea5f1 builder/amazon: crash on tagging snapshot when snapshot_tags is unset 
Closes #4238
 2016-12-01 20:43:15 +01:00
Rickard von Essen
bcc7f455b3 amazon: Fix source_ami_filter ignores owners 2016-12-01 14:29:31 +01:00
Arthur Burkart
576f6f1b39 Fixes acceptance test 
The original acceptance test required a manual check. This one does
not.
 2016-11-30 22:58:19 -05:00
Matthew Hooker
832de2104b
Revert "Merge pull request #4230 from mitchellh/revert-4223-closes_3320" 
This reverts commit bda89b0c42deb186f18a68931c001afbe406dffb, reversing
changes made to f9f9d8241967bfde493529ad0b9b42f3e422fd51.
 2016-11-30 13:28:34 -08:00
Matthew Hooker
f5c3c25d2b Revert "Adds force_delete_snapshot flag" 2016-11-30 13:10:22 -08:00
Matthew Hooker
f9f9d82419 Merge pull request #4223 from artburkart/closes_3320 
Adds `force_delete_snapshot` flag
 2016-11-30 12:53:34 -08:00
Arthur Burkart
5b59f56cdb Adds force_delete_snapshot flag 
This PR adds the ability for Packer to clean up snapshots in addition to
deregistering AMIs at build time.

To test this, I used the following `test.json` file:

```json
{
  "builders": [
    {
      "type": "amazon-ebs",
      "region": "us-east-1",
      "source_ami": "ami-fce3c696",
      "ami_name": "packer-test",
      "instance_type": "m3.medium",
      "ssh_username": "ubuntu",
      "vpc_id": "some-vpc-id",
      "subnet_id": "some-subnet-routed-through-igw",
      "security_group_id": "some-security-group-with-port-22-access",
      "force_delete_snapshot": true
    }
  ],
  "provisioners": [
    {
      "type": "shell-local",
      "command": "echo 'hello'"
    }
  ]
}

```

I appreciate any constructive feedbakc that can be given. Cheers!
 2016-11-29 23:39:36 -05:00
Rickard von Essen
99ee610afa
builder/amazon: Fix SSH Agent 
Closes #4220
 2016-11-29 22:33:53 +01:00
Matthew Hooker
aedf4ca465 Merge pull request #4141 from mitchellh/ebsvoluemartifact 
add ebsvolume artifact
 2016-11-28 15:50:03 -08:00
Matthew Hooker
50267572a4
add ebsvolume artifact 2016-11-28 15:26:09 -08:00
Rickard von Essen
a09f20f996 Merge pull request #4015 from artburkart:closes_3908 
Closes #3908: Adds snapshot tag overrides
 2016-11-26 17:54:00 +01:00
Arthur Burkart
0c7e73b1cf
Implements Snapshot tagging 
While implementing my acceptance test, I stumbled upon a comment stating
that snapshot deletion should also be implemented, so I snuck that in. I
can't help but wonder if there is some generic logic that is implemented
a few times throughout the packer code base that could maybe better serve
us if it were abstracted to the common package.
 2016-11-26 17:48:26 +01:00
Rickard von Essen
17eda06d61
Fixed formatting 2016-11-24 21:12:20 +01:00
ephemeralsnow
e53f4be005 Fix 'The AssociatePublicIpAddress parameter is only supported for VPC launches.' 2016-11-24 17:01:32 +01:00
Rickard von Essen
96e9a8e6e9 Removed default value for ssh_username 2016-11-17 22:30:34 +01:00
Arthur Burkart
2e65867cba Closes #3908: Adds snapshot tag overrides 
This commit adds the ability to configure unique tags on snapshots
that are separate from the tags defined on the AMI. Anything applied
to the AMI will also be applied to the snapshots, but `snapshot_tags`
will override and append tags to the tags already applied to the snapshots
 2016-11-15 23:16:27 -05:00
Matthew Hooker
9a91ae4e8f
fix new session error when creating cred chain. 
the old and deprecated method won't error and so is safe to use
even if we're not in amazon.
 2016-11-14 11:39:22 -08:00
Matthew Hooker
d81c06765d
fix go vet issue. 
closes #4130
 2016-11-07 10:17:53 -08:00
Matthew Hooker
f3f5f89fe6 Merge pull request #4096 from mitchellh/filterday 
builder/amazon-ebs: show ami id found from filter
 2016-11-02 12:25:46 -07:00
Matthew Hooker
60c459d6c8 Merge pull request #4098 from mitchellh/newsession 
aws-sdk: use session.NewSession
 2016-11-02 12:25:14 -07:00
Matthew Hooker
9bc23ea512 Merge pull request #4099 from mitchellh/waitfail 
Waitfail
 2016-11-02 12:21:51 -07:00
James Nugent
36c09af992 builder/amazon: Add tests for the ebs-volume builder 
These smoke tests are effectively a mirror of the EBS builder tests.
 2016-11-02 12:56:39 -04:00
James Nugent
b1ff8c3bfc builder/amazon: Add ebs-volume builder 
This commit adds a builder that works like EBS builders, except does not
create an AMI, and instead is intended to create EBS volumes in an
initialized state. For example, the following template can be used to
create and export a set of 3 EBS Volumes in a ZFS zpool named `data` for
importing by instances running production systems:

```
{
	"variables": {
		"aws_access_key_id": "{{ env `AWS_ACCESS_KEY_ID` }}",
		"aws_secret_access_key": "{{ env `AWS_SECRET_ACCESS_KEY` }}",
		"region": "{{ env `AWS_REGION` }}",
		"source_ami": "{{ env `PACKER_SOURCE_AMI` }}",
		"vpc_id": "{{ env `PACKER_VPC_ID` }}",
		"subnet_id": "{{ env `PACKER_SUBNET_ID` }}"
	},
	"builders": [{
		"type": "amazon-ebs-volume",
		"access_key": "{{ user `aws_access_key_id` }}",
		"secret_key": "{{ user `aws_secret_access_key` }}",
		"region": "{{user `region`}}",
		"spot_price_auto_product": "Linux/UNIX (Amazon VPC)",

		"ssh_pty": true,
		"instance_type": "t2.medium",
		"vpc_id": "{{user `vpc_id` }}",
		"subnet_id": "{{user `subnet_id` }}",
		"associate_public_ip_address": true,
		"source_ami": "{{user `source_ami` }}",
		"ssh_username": "ubuntu",
		"ssh_timeout": "5m",

		"ebs_volumes": [
			{
				"device_name": "/dev/xvdf",
				"delete_on_termination": false,
				"volume_size": 10,
				"volume_type": "gp2",
				"tags": {
					"Name": "TeamCity-Data1",
					"zpool": "data",
					"Component": "TeamCity"
				}
			},
			{
				"device_name": "/dev/xvdg",
				"delete_on_termination": false,
				"volume_size": 10,
				"volume_type": "gp2",
				"tags": {
					"Name": "TeamCity-Data2",
					"zpool": "data",
					"Component": "TeamCity"
				}
			},
			{
				"device_name": "/dev/xvdh",
				"delete_on_termination": false,
				"volume_size": 10,
				"volume_type": "gp2",
				"tags": {
					"Name": "TeamCity-Data3",
					"zpool": "data",
					"Component": "TeamCity"
				}
			}
		]
	}],
	"provisioners": [
	{
		"type": "shell",
		"start_retry_timeout": "10m",
		"inline": [
			"DEBIAN_FRONTEND=noninteractive sudo apt-get update",
			"DEBIAN_FRONTEND=noninteractive sudo apt-get install -y zfs",
			"lsblk",
			"sudo parted /dev/xvdf --script mklabel GPT",
			"sudo parted /dev/xvdg --script mklabel GPT",
			"sudo parted /dev/xvdh --script mklabel GPT",
			"sudo zpool create -m none data raidz xvdf xvdg xvdh",
			"sudo zpool status",
			"sudo zpool export data",
			"sudo zpool status"
		]
	}
	]
}
```

StepModifyInstance and StepStopInstance are now shared between EBS and
EBS-Volume builders - move them into the AWS common directory and rename
them to indicate that they only apply to EBS-backed builders.
 2016-11-02 12:56:39 -04:00
Matthew Hooker
d47e47cf1f rewrite to not use private aws package 2016-11-01 18:29:18 -07:00
Matthew Hooker
c4c46c349e implement security group waiter 2016-11-01 18:10:42 -07:00
Matthew Hooker
970b37077e Merge pull request #4050 from jen20/ssh-agent 
builder/amazon: Allow use of local SSH Agent
 2016-11-01 17:27:37 -07:00
Matthew Hooker
48bdae93d1 aws-sdk: use session.NewSession 2016-11-01 15:53:04 -07:00
Matthew Hooker
83b57b98ac show ami id found from filter 2016-11-01 15:26:43 -07:00
Matthew Hooker
d920b3fbf4 run gofmt 2016-11-01 14:08:04 -07:00
Matthew Hooker
0dd7d7ff3b fix error message 2016-10-31 16:44:18 -07:00
Ganesh kumar Sankaran
b9c6139d67 AWS async operations sometimes takes long times, if there are multiple parallel builds, polling at 2 second frequency will exceed the request limit. Allow 2 seconds to be overwritten with AWS_POLL_DELAY_SECONDS 2016-10-31 16:44:18 -07:00
Rickard von Essen
d66490ebfd
Properly cleanup AWS temporary key pairs 
Closes #4057 - Amazon key pair no longer cleaned up at end of build
 2016-10-27 23:06:13 +02:00