Commit Graph

3247 Commits

Author SHA1 Message Date
Megan Marsh 2b8fe72e30 add to sidebar nav 2019-06-06 14:31:02 -07:00
Megan Marsh bc5a48327d fix copypasta 2019-06-06 14:30:09 -07:00
Megan Marsh 668e92f2ca add docs and the option to list variables from inside the console 2019-06-06 14:26:12 -07:00
praveen4463 a9505b27aa
fixing a broken link to cloudywindows.io
Fixed broken link from https://cloudywindows.io/post/winrm-for-provisioning---close-the-door-on-the-way-out-eh/ to https://cloudywindows.io/post/winrm-for-provisioning-close-the-door-on-the-way-out-eh/
2019-06-04 08:47:46 +05:30
Megan Marsh a5cd37b51d
Merge pull request #7711 from amydutta/master
Update Azure docs with Shared Image Gallery (for MDI only) as destination example
2019-06-03 13:41:55 -07:00
Amrita Dutta 29b1aad441 fix indent 2019-06-03 17:58:41 +00:00
Amrita Dutta db661445d2 fix return 2019-06-03 17:57:21 +00:00
Amrita Dutta 14c442345f Update Azure Docs with SIG example 2019-06-03 17:53:44 +00:00
Brian Fox 9368269034 Add missing "vagrant package" parameters to documentation 2019-06-02 21:01:52 +02:00
Brian Fox 365f44d1c3 Spelling 2019-06-02 21:01:28 +02:00
Adrien Delorme a145804795
Merge pull request #7597 from oseiberts11/add-openstack-image-properties
Add image filtering on properties.
2019-05-31 11:03:56 +02:00
Megan Marsh 1204213516
Merge pull request #7678 from hashicorp/docker_windows_defaults
builder/docker: better windows defaults
2019-05-24 11:19:32 -07:00
Megan Marsh 6f560bef0a
Merge pull request #7653 from aaronwalker/chef_license_acceptance
adds support for accepting the chef license
2019-05-24 11:12:09 -07:00
Megan Marsh 708165eaa8 refactoring step_run_spot_instance and swapping out the calls to create a spot instance with a call to create a spot fleet of one, so that we can be more flexible with the instance type when desired 2019-05-24 09:32:54 -07:00
Dexter Lakin 873db48391
Fix typo and update ubuntu image version
The old url is no longer available, user `cpu should be `cpus
2019-05-24 16:22:13 +01:00
Aaron Walker c1141c849f update docs 2019-05-24 16:29:18 +02:00
Adrien Delorme 68a3be9f90 document execution_policy for powershell 2019-05-23 17:39:02 +02:00
Adrien Delorme 2da36b7374 builder/docker: default container dir to "c:/packer-files" on windows 2019-05-22 16:55:26 +02:00
Tony b72a55a3fb
Update virtualbox-iso.html.md.erb
remove cpus/memory flags due to their property implementation, add vram for example
2019-05-20 10:09:45 -04:00
Megan Marsh 3222f361ce add partials 2019-05-17 14:33:06 -07:00
Megan Marsh 657308c232 update volume_type docs and move ami_block_device_mappings into partials so that we don't have to keep it updated in four places. Two partials so that we can properly alphabetize the kms_key_id property only available in chroot 2019-05-17 13:48:49 -07:00
Aaron Walker dfc5e5cf94 adds support for accepting the chef license 2019-05-17 17:19:22 +02:00
Adrien Delorme bfb3b99e8e cut release 2019-05-15 14:54:10 +02:00
Adrien Delorme 4eecc7a580 document alias keys usage
refactor kms_key_id doc into the same partial
2019-05-14 12:29:28 +02:00
Megan Marsh 73d4d89ee8 fix website formatting 2019-05-10 11:12:11 -07:00
Megan Marsh 1062295ecd add omit_from_artifact option for ebssurragote launch_block_devices 2019-05-10 11:12:11 -07:00
Megan Marsh ada6b97126 document vault client env vars 2019-05-09 13:42:48 -07:00
Megan Marsh c89b6ed892
Merge pull request #7620 from hashicorp/do_7358
Allow users to set architecture in ebssurrogate and chroot ami registration
2019-05-09 11:38:18 -07:00
Alvin Huang e40943ef8f pin github and netlify providers 2019-05-09 14:21:26 -04:00
Alvin Huang c9665b7a9d set insecure_ssl and a custom site domain 2019-05-09 13:54:23 -04:00
Alvin Huang 506eb40d56 remove name argument for github_repository_webhook 2019-05-09 13:41:42 -04:00
Megan Marsh 02c9f24531 allow user to set architecture 2019-05-07 16:38:55 -07:00
Megan Marsh d2bb42a9ba
Merge pull request #7616 from howlowck/patch-1
Fixed typo in documentation
2019-05-07 16:05:19 -07:00
Megan Marsh fdae14bc18
Merge pull request #7551 from krzyszko/gcp_encryption_key
Googlecompute builder image encryption support
2019-05-07 15:59:59 -07:00
Hao Luo 98ea8b272f removed the other count 2019-05-07 12:44:49 -05:00
Megan Marsh e4326d1045
Update website/source/docs/builders/azure.html.md
Co-Authored-By: howlowck <howlowck@gmail.com>
2019-05-07 12:40:19 -05:00
Megan Marsh c290414f63
Merge pull request #7610 from hashicorp/doc_ovf_local_only
virtualbox-ovf.html.md.erb: update doc to current usage
2019-05-07 10:22:30 -07:00
Hao Luo 2c24c36589
Update azure.html.md
Getting the count right.
2019-05-06 17:02:13 -05:00
Adrien Delorme 5fd683c0cf virtualbox-ovf.html.md.erb: update doc to current usage 2019-05-06 17:08:45 +02:00
krisko f2f6772aee
Document image_encryption_key 2019-05-02 17:58:47 +02:00
Adrien Delorme 9281fada2d prevent a breaking change so that we can merge the `-parallel-builds` option first. 2019-05-02 16:24:28 +02:00
Adrien Delorme ae71a81c1e Merge remote-tracking branch 'origin/master' into pr/7501 2019-05-02 11:47:43 +02:00
Megan Marsh d343852c15
Merge pull request #7591 from hashicorp/doc_docker
docker builder: document entrypoint option
2019-05-01 14:24:35 -07:00
Megan Marsh 16f0a80054 Update website/source/docs/builders/docker.html.md 2019-05-01 12:07:47 -07:00
Adrien Delorme d08f3e0bdb document entrypoint option 2019-05-01 12:07:47 -07:00
Megan Marsh c317679f52 add some docs for how to do complex custom commands 2019-05-01 11:00:07 -07:00
Adrien Delorme b7be4f9c74
Merge pull request #7564 from zaenk/proxmox-builder-static-ssh-host
ProxMox builder: Use ssh_host config as host for the communicator
2019-05-01 11:04:04 +02:00
Peter Pribula 02b6e7f3de Changes `qemu_agent` config frm string to bool
Defaults to true
2019-04-30 20:23:34 +02:00
Olaf Seibert 58f8f088e2 Add image filtering on properties.
Initial commit with debugging info.
2019-04-30 16:34:40 +02:00
Megan Marsh e7c4cc622e
Update website/source/docs/extending/custom-post-processors.html.md
Co-Authored-By: azr <azr@users.noreply.github.com>
2019-04-30 11:56:56 +02:00
Megan Marsh 27cf53003f
Update website/source/docs/extending/custom-post-processors.html.md
Co-Authored-By: azr <azr@users.noreply.github.com>
2019-04-30 11:56:39 +02:00
Adrien Delorme 1be337b383 update docs for definig Builders and PostProcessors 2019-04-29 13:16:46 +02:00
h4ckNinja a537888fb0
Move the communicator pause_before_connecting
block to a code block and fix the JSON
2019-04-28 23:20:13 -07:00
wb-ywq399345 0da7b918ce support encryption with default service key 2019-04-26 15:12:07 +08:00
chhaj5236 6b081cc41c
update alicloud builder to use official SDK (#7477) 2019-04-26 10:37:49 +08:00
Peter Pribula cb7b77cd90 Adds `qemu_agent` optional config parameter 2019-04-25 19:25:00 +02:00
yuriolive 6ba479d723
Missing comma in JSON
JSON is invalid, is missing a comma
2019-04-25 12:58:46 -03:00
Adrien Delorme b1ffc1c814
Merge pull request #7539 from hashicorp/reverse_winrm_admonishment
warn users to lock down winrm after provisioning
2019-04-23 15:46:35 +02:00
Adrien Delorme 4e49a3307d
Merge pull request #7538 from hashicorp/ssh_explanation_table
add a table explaining what to expect with different ssh options for …
2019-04-23 15:43:25 +02:00
Adrien Delorme ee743f0b7c
Update website/source/partials/builders/_aws-ssh-differentiation-table.html.md 2019-04-23 15:42:59 +02:00
Adrien Delorme 95c8ac8a93
Merge pull request #7537 from hashicorp/vmotion_warning
add vmotion warning to vmware remote builder section, and move the re…
2019-04-23 15:40:04 +02:00
Adrien Delorme 5399e8a67d
Merge pull request #7547 from hashicorp/comment_guide
add guide for uisng jq to strip comments from packer template
2019-04-23 15:26:24 +02:00
Adrien Delorme fcfb044264
Merge pull request #7548 from hashicorp/isotime_documentation
add docs for how to use the format strings for the isotime function
2019-04-23 15:21:00 +02:00
Adrien Delorme c2021318fe
Merge pull request #7543 from carlpett/proxmox-docs-and-ports
Proxmox docs and ports
2019-04-23 11:37:12 +02:00
Megan Marsh f985f2de62 add docs for how to use the format strings for the isotime function 2019-04-22 16:10:35 -07:00
Megan Marsh 9eadac3410 add guide for uisng jq to strip comments from packer template 2019-04-22 15:35:00 -07:00
Calle Pettersson b56b3dda5f Fix os parameter documentation 2019-04-21 08:33:51 +02:00
Megan Marsh 11037968a8 warn users to lock down winrm after provisioning 2019-04-19 17:03:20 -07:00
Megan Marsh 8c9f2f5e1c add a table explaining what to expect with different ssh options for the amazon builders. Also convert builder docs to .erb to support partials 2019-04-19 16:35:15 -07:00
Megan Marsh fe7f5343fd add vmotion warning to vmware remote builder section, and move the remote builder section into a partial referenced by both the vmx and iso builders 2019-04-19 15:58:20 -07:00
Megan Marsh 7b4f138217 update docs explaining that you need local artifact for vagrant pp 2019-04-19 15:17:37 -07:00
Adrien Delorme f08373c4fe
Merge pull request #7494 from BenResTech/master
[WIP] Added warnings about writeable locations
2019-04-18 13:41:07 +02:00
Megan Marsh 5ef8595bf3
Merge pull request #7520 from hashicorp/fix_7519
fix quoting in ssh partial
2019-04-17 10:22:27 -07:00
Megan Marsh 992ab93708 fix quoting in ssh partial 2019-04-17 09:55:21 -07:00
Marques Johansson 99987c2d56 Add Linode Images builder
Packer Builder for [Linode Images](https://www.linode.com/docs/platform/disk-images/linode-images/)

Adds the following builder:

  * `linode`

Based on https://github.com/linode/packer-builder-linode (MPL/2)
(formerly maintained by @dradtke).  Includes website docs and tests.

Relates to #174, #3131
2019-04-15 20:40:59 -04:00
Megan Marsh 45af9f0cbc
Merge pull request #7498 from hashicorp/do_7465
add keep_registered option to hyperv
2019-04-15 11:12:43 -07:00
Adrien Delorme a78970c029 virtualbox-ovf: also document that the checksum field is now mandatory 2019-04-15 15:29:41 +02:00
Adrien Delorme 97f2914c6a
Merge pull request #7484 from yandex-cloud/yandex-cloud-builder
Builder for Yandex.Cloud
2019-04-15 14:02:43 +02:00
Brett Wandel 92e75f838a added the ability to limit number of builds running in parallel 2019-04-13 22:31:54 +10:00
Megan Marsh 73205f3a91 add keep_registered option to hyperv 2019-04-12 15:59:09 -07:00
Megan Marsh 0a8e19b01b
Merge pull request #7491 from hashicorp/pause_before_connecting_docs
Pause before connecting docs
2019-04-12 11:08:16 -07:00
Adrien Delorme d2f036ec44 Revert "Revert "Merge pull request #7391 from carlpett/proxmox-builder""
This reverts commit 032527ecfe.
2019-04-12 12:26:34 +02:00
Ben Allen c2ef47495e
Added warnings about writeable locations 2019-04-12 11:03:41 +01:00
Nick Fagerlund c277a0396b website: Update middleman-hashicorp to 0.3.39, update Gemfile.lock
This commit fixes some dependencies with known issues. It DOES increase the
first build time by quite a bit because a few of the updated dependencies now
use native extensions, but once it's cached you should be good.
2019-04-11 16:22:21 -07:00
Megan Marsh 26629efbf0 Megan and Adrien don't know how to web well 2019-04-11 15:40:53 -07:00
Megan Marsh 32b68de4db clarify pause before connecting code 2019-04-11 15:26:16 -07:00
Gennady Lipenkov 8e4e314553 Bulk update 'yandex' builder
Squashed commit of the following:

commit ccc020231780179d241d46eef7c0ba103366aed0
Author: Yandex.Cloud Bot <ycloud-bot@yandex.ru>
Date:   Tue Apr 9 14:38:30 2019 +0000

    sync upstream
2019-04-12 01:00:54 +03:00
Gennady Lipenkov a12c5d57ec Bulk update builder (doc, acc test)
Squashed commit of the following:

commit 372db94a5c4bc81bd4149de5ea9c21946362f3f9
Author: Yandex.Cloud Bot <ycloud-bot@yandex.ru>
Date:   Thu Apr 4 13:16:03 2019 +0000

    sync upstream
2019-04-12 01:00:54 +03:00
Gennady Lipenkov d816bb1700 Init doc page
Squashed commit of the following:

commit adff177ad2e3fc9d73bcf9703c7443ae33922dca
Author: Yandex.Cloud Bot <ycloud-bot@yandex.ru>
Date:   Tue Mar 26 20:52:08 2019 +0000

    sync upstream
2019-04-12 01:00:54 +03:00
Megan Marsh b8555d4681 cut release 1.4.0 2019-04-11 11:19:03 -07:00
Adrien Delorme 032527ecfe Revert "Merge pull request #7391 from carlpett/proxmox-builder"
This reverts commit b7d62b2ae0, reversing
changes made to c36eaf16f7.
2019-04-11 14:19:25 +02:00
Adrien Delorme aee73d745d update code after go mod update 2019-04-11 14:19:24 +02:00
Adrien Delorme dcd21d37da
Merge pull request #7489 from hashicorp/context_provisioner
Context provisioner
2019-04-11 11:55:29 +02:00
Shintaro Kaneko e1164a6a56
Fix minor typo for GCP docs 2019-04-10 10:47:50 +09:00
Jakob 65afb675d1
Fix typo in openstack builder docs 2019-04-09 16:51:39 +02:00
Adrien Delorme aa3cb5be63 document common provisioner parameters 2019-04-08 20:09:22 +02:00
Adrien Delorme 06941a86a3 make the file builder run provisioners for testing purposes 2019-04-08 20:09:21 +02:00
Adrien Delorme d8d5631dc2 allow to set provisioner timeout from buildfile 2019-04-08 20:09:21 +02:00
Megan Marsh b7d62b2ae0
Merge pull request #7391 from carlpett/proxmox-builder
Implement Proxmox builder
2019-04-08 09:54:11 -07:00
Megan Marsh c36eaf16f7
Merge pull request #7473 from MisterMiles/patch-1
Update shell-local.html.md
2019-04-08 09:53:39 -07:00
Megan Marsh efd568c10c fix docs 2019-04-08 09:30:23 -07:00
Megan Marsh 3e72e65a6c
Merge pull request #7456 from hashicorp/do_5770
introduce the clean_resource_name to clean image/var names
2019-04-05 09:12:20 -07:00
Megan Marsh 1f7150e2ee
Merge pull request #7463 from hashicorp/default_keep_input_artifact
Default keep input artifact
2019-04-05 08:10:40 -07:00
MisterMiles 5ab8cc6ded
Update shell-local.html.md
The last sentence is misleading because it is assumed that the shell-inline parameter is only executed on the machine which is build by packer.
2019-04-05 16:16:25 +02:00
Calle Pettersson 1d16b4ec41 Add docs 2019-04-04 15:20:46 -07:00
Megan Marsh 196028a7ed
Merge pull request #7444 from hashicorp/docker_windows
Docker windows
2019-04-04 09:30:43 -07:00
Megan Marsh 10f47b5158 document clearly what keep_input_artifact does for each post-processor 2019-04-03 13:57:22 -07:00
Adrien Delorme 9836dad0c9 introduce the clean_resource_name to clean image names and deprecate the old ones 2019-04-03 11:25:51 +02:00
John Jones d0eb2609a8
Ansible 2,7 "use_tty" fix
Per Issue #6453, Ansible@2.7 targetting Windows was throwing the following error when setup as the docs instruct:
"Requested option use_tty was not defined in configuration"

This is caused by something in Ansible silently discarding the whole `DOCUMENTATION` string configuration when it can't parse it. The changed line in this PR fixes that. :)
2019-04-02 21:17:08 -07:00
Megan Marsh e4842b69b4
Merge pull request #7458 from hashicorp/update-vagrant-provider-doc
update vagrant provider documentation
2019-04-02 11:08:33 -07:00
Megan Marsh 17c14770a7
Merge pull request #7450 from AkshatM/rename_security_group_cidr_to_security_group_cidrs
Rename and change `temporary_security_group_source_cidr`  to accept a list of strings (for Amazon builders).
2019-04-02 10:54:31 -07:00
Alvaro Miranda Aguilera dbe3b361b5
update vagrant provider
add clarification on provider when source have more than 1 provider.
also add an example.
2019-04-02 19:20:10 +02:00
Adrien Delorme 225f4bab1f
Merge pull request #7446 from hashicorp/do_6928
remove default ssh_username from oracle classic builder, but add note…
2019-04-01 17:24:36 +02:00
Akshat Mahajan f07e4214cc Addresses issues #5384, #5494: Rename and change `temporary_security_group_source_cidr`
to accept a list of strings (for Amazon builders).

Per this change, `temporary_security_group_source_cidr` in the configuration:

1. Will be renamed to `temporary_security_group_source_cidrs`.
2. Will accept a list of CIDRs.
3. Will have its documentation updated to reflect this change.
4. Will have a fixer attached for newer templates to avail of.
2019-03-30 15:47:03 -07:00
Megan Marsh b3c6dd0baa fix tests 2019-03-29 15:52:41 -07:00
Megan Marsh bcacd331c3 change cpu to cpus and ram_size to memory in order to bring hyper v into line with other builder defaults 2019-03-29 15:12:51 -07:00
Megan Marsh a84fc6bde9 remove default ssh_username from oracle classic builder, but add note in docs. 2019-03-29 14:24:12 -07:00
Megan Marsh b079d7ba12 add windows container example 2019-03-29 13:39:40 -07:00
Megan Marsh a01091952d add documentation for windows_container flag 2019-03-28 16:26:38 -07:00
Megan Marsh e97f864016
Merge pull request #7395 from josepand/openstack_force_delete
Expose force_delete for openstack builder
2019-03-25 17:34:00 -06:00
Megan Marsh 2c67cd966b
Merge pull request #7396 from c0sco/amazon-import-encryption
Support S3 and AMI encryption in amazon-import post-processor
2019-03-25 17:24:49 -06:00
Megan Marsh 02230a8121
Merge pull request #7424 from mayn/add-community-tools-packerpy
request to add packer.py to community tools
2019-03-20 07:55:42 -06:00
Matthew Aynalem 90e67349fc add packer.py to community tools 2019-03-19 12:14:09 -07:00
Paul Meyer e4bea87a20
Merge pull request #7211 from riezebosch/master
arm-builder: specify zone resilient image from config
2019-03-19 08:59:29 -07:00
Esten Rye 19c72f7867 Add additional detalis for Hyper-V users 2019-03-15 20:51:40 -05:00
Esten Rye 8f10683a20 Update incorrect documentation on vagrant builder.
The packer option `vagrantfile_template` is not used.
This change corrects the documentation with the correct option name.

Closes #7414
2019-03-15 20:22:51 -05:00
Megan Marsh 8853fc1946
Merge pull request #7385 from hashicorp/windows_shell_allow_exit_code
allowed_exit_codes for windows-shell and shell provisioners
2019-03-15 16:13:45 -07:00
Megan Marsh 24c42e4a1f
Merge pull request #7397 from vhaidamaka/fix-7321
Add vagrant-cloud post-processor support for the vagrant builder
2019-03-15 16:00:05 -07:00
Adrien Delorme a9e9fff3ad docs: refactor comon shell configurations into a partial 2019-03-14 13:12:03 +01:00
Adrien Delorme f369ae2178 Update windows-shell.html.md
copy paste valid_exit_codes from powershell.html.md
2019-03-14 11:17:06 +01:00
Adrien Delorme 9f82b75e57 Use the hashicorp/go-getter to download files
* removed packer.Cache and references since packer.Cache is never used except in the download step. The download step now uses the new func packer.CachePath(targetPath) for this, the behavior is the same.
* removed download code from packer that was reimplemented into the go-getter library: progress bar, http download restart, checksuming from file, skip already downloaded files, symlinking, make a download cancellable by context.
* on windows if packer is running without symlinking rights and we are getting a local file, the file will be copied instead to avoid errors.
* added unit tests for step_download that are now CI tested on windows, mac & linux.
* files are now downloaded under cache dir `sha1(filename + "?checksum=" + checksum) + file_extension`
* since the output dir is based on the source url and the checksum, when the checksum fails, the file is auto deleted.
* a download file is protected and locked by a file lock,
* updated docs
* updated go modules and vendors
2019-03-13 12:11:58 +01:00
Megan Marsh 0196d7f835
Merge pull request #7370 from sargun/allow-users-to-specify-custom-block-device-mapping
amazon-chroot: Allow users to specify custom block device mapping
2019-03-12 14:21:23 -07:00
Vadym Haidamaka 4855bc79c9 Add vagrant-cloud post-processor support for the vagrant builder 2019-03-12 05:33:46 +02:00
Vadym Haidamaka 535dfd9333 Fix typos in the vagrant builder doc 2019-03-12 05:07:55 +02:00
Matt Stofko ab4382360d Support S3 and AMI encryption 2019-03-11 13:21:47 -07:00
Sargun Dhillon 0e8eb61699 Add documentation around new behaviour of ami_block_device_mappings
Previously, if ami_block_device_mappings was set, and you were building
from an existing image, it would get silently ignored, and changing
root_device_name would be ignored. This changes that behaviour, so
if ami_block_device_mappings is specified, it's respected.
2019-03-11 11:40:49 -07:00
josepand f2b42f2b4b Expose force_delete for openstack builder
Very similar to how its exposed in terraform adds an optional force_delete config entry on the openstack builder.
2019-03-11 18:39:47 +00:00
Adrien Delorme c207a84cb8
Update website/source/docs/builders/vagrant.html.md
Co-Authored-By: davividal <davividal@gmail.com>
2019-03-07 16:19:29 +01:00
Davi Vidal 0fb89ff4c3 Fixes dead link 2019-03-07 15:09:30 +01:00
Megan Marsh a6d1d852bb
Merge pull request #7377 from davividal/vagrant-cloud-disable-ssl-verify
Ignores SSL verification when on premise vagrant cloud
2019-03-06 14:24:42 -08:00
Davi Vidal e3618bdedf Improves insecure_skip_tls_verify doc, expliciting an use case 2019-03-06 21:38:57 +01:00
Davi Vidal 6c3b74bfd3 Adds documentation on insecure_skip_tls_verify 2019-03-06 11:13:25 +01:00
Anton Kvashenkin 5e3078b9e9
Fix typo in vagrant builder description
Fix typo in `add_insecure` option.
2019-03-06 08:46:49 +03:00
Megan Marsh 5aeab4ec06
Merge pull request #7300 from kmbulebu/openstack_app_creds
OpenStack: Support Application Credential Authentication
2019-03-05 13:11:51 -08:00
Megan Marsh 5aa55f194d add vagrant docs to website 2019-03-05 09:31:14 -08:00
Megan Marsh 3dc1dafe58
Merge pull request #7287 from stephen-fox/ephemeral-ssh-key-pair-issue-7225
virtualbox: create ephemeral SSH key pair for build process
2019-03-04 14:25:04 -08:00
Arnaud Dezandee f9ae926d8f
googlecompute-export: set network project id to builder 2019-03-01 15:12:31 +01:00
Megan Marsh 3b6ff0fe3e
Merge pull request #7106 from hashicorp/revert_docker_changes
docker: user /bin/sh by default
2019-02-28 15:31:53 -08:00
Megan Marsh 424a6a3a7e
Merge pull request #6983 from hashicorp/revert-6979-revert-6925-organization_renaming
DONT MERGE YET: Revert "Revert "Rename attribute api_access_key to organization_id""
2019-02-28 15:30:25 -08:00
Megan Marsh d3ed89ab86
Merge pull request #6787 from hashicorp/nilable_encrypt
amazon: Nilable encrypt setting
2019-02-28 15:29:40 -08:00