From 22372dcb9ebc75719fb689da6ea6bc39e43f7d64 Mon Sep 17 00:00:00 2001 From: Matthew Aynalem Date: Thu, 11 Oct 2018 14:20:30 -0700 Subject: [PATCH] #122 correct shutdown_behavior type for remaining Amazon resources --- README.rst | 1 + src/packerlicious/builder.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index fd59a05..da5e05b 100644 --- a/README.rst +++ b/README.rst @@ -160,6 +160,7 @@ Provisioners: Community Plugins: + - packer-provisioner-inspec Licensing diff --git a/src/packerlicious/builder.py b/src/packerlicious/builder.py index e307352..752390f 100644 --- a/src/packerlicious/builder.py +++ b/src/packerlicious/builder.py @@ -369,7 +369,7 @@ class AmazonEbsSurrogate(PackerBuilder): 'run_volume_tags': (dict, False), 'security_group_id': (str, False), 'security_group_ids': ([str], False), - 'shutdown_behavior': ([str], False), + 'shutdown_behavior': (str, False), 'skip_region_validation': (validator.boolean, False), 'snapshot_groups': ([str], False), 'snapshot_users': ([str], False), @@ -443,7 +443,7 @@ class AmazonEbsVolume(PackerBuilder): 'run_tags': (dict, False), 'security_group_id': (str, False), 'security_group_ids': ([str], False), - 'shutdown_behavior': ([str], False), + 'shutdown_behavior': (str, False), 'skip_region_validation': (validator.boolean, False), 'snapshot_groups': ([str], False), 'snapshot_users': ([str], False), @@ -495,7 +495,7 @@ class AmazonInstance(PackerBuilder): """ AWS Instance Template Variables https://www.packer.io/docs/builders/amazon-ebs.html#ami_description - TODO impl validation ami_virtualization_type region_kms_key_ids run_volume_tags shutdown_behavior + TODO impl validation ami_virtualization_type region_kms_key_ids run_volume_tags spot_price_auto_product ssh_keypair_name """ SourceAMI = TemplateVar("SourceAMI")