builderator 1.2.1 → 1.2.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/builderator/config/file.rb +2 -0
- data/lib/builderator/interface/packer.rb +10 -0
- data/template/Vagrantfile.erb +4 -0
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 6783dc56369ee7edcd63e06afb7b6a0cf07e0c4b
|
4
|
+
data.tar.gz: e2aa20916ffd711e7a4231fe1b27276670241b91
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: dc6a8c4e53d14f73a828d43c1cd254fc4d00579b974e60e658bac84915a6dcddb3eaff7038b51702bfa5860bdd757e1c7e821f5f7cddad6339b6f8d5965ff85b
|
7
|
+
data.tar.gz: 75b80cbbac9da94f87285b8c4056cd8bb3d8f7aa62a69aa6b8cd40aa89e340d08b31e8e04152e859499366a69af9c2eef32886bcd1df603c666c8e7b6a458a97
|
@@ -188,6 +188,7 @@ module Builderator
|
|
188
188
|
attribute :run_list, :type => :list, :singular => :run_list_item
|
189
189
|
attribute :environment
|
190
190
|
attribute :node_attrs, :type => :hash
|
191
|
+
attribute :binary_env
|
191
192
|
end
|
192
193
|
|
193
194
|
##
|
@@ -210,6 +211,7 @@ module Builderator
|
|
210
211
|
attribute :enhanced_networking
|
211
212
|
attribute :security_group_ids, :type => :list, :singular => :security_group_id
|
212
213
|
attribute :iam_instance_profile
|
214
|
+
attribute :encrypt_boot
|
213
215
|
|
214
216
|
attribute :source_ami
|
215
217
|
attribute :user_data
|
@@ -28,6 +28,16 @@ module Builderator
|
|
28
28
|
b[:tags] = Config.profile.current.tags
|
29
29
|
end
|
30
30
|
|
31
|
+
# If we specify encrypted boot, packer won't allow ami_users.
|
32
|
+
# See: https://github.com/MYOB-Technology/packer/blob/509cd7dcf194beb6ca6d0c39057f7490fa630d78/builder/amazon/common/ami_config.go#L59-L61
|
33
|
+
|
34
|
+
# A PR (https://github.com/mitchellh/packer/pull/4023) has been
|
35
|
+
# submitted to resolve this issue but we shouldn't remove this
|
36
|
+
# until a new Packer release with this feature.
|
37
|
+
if build_hash.key?(:encrypt_boot)
|
38
|
+
build_hash.delete(:ami_users)
|
39
|
+
end
|
40
|
+
|
31
41
|
## Support is missing for several regions in some versions of Packer
|
32
42
|
# Moving this functionality into a task until we can confirm that Packer
|
33
43
|
# has full support again.
|
data/template/Vagrantfile.erb
CHANGED
@@ -81,6 +81,10 @@ Vagrant.configure('2') do |config|
|
|
81
81
|
chef.environment = '<%= profile.current.chef.environment %>'
|
82
82
|
<% end -%>
|
83
83
|
|
84
|
+
<% unless profile.current.chef.binary_env.nil? -%>
|
85
|
+
chef.binary_env = '<%= profile.current.chef.binary_env %>'
|
86
|
+
<% end -%>
|
87
|
+
|
84
88
|
<% if profile.current.chef.node_attrs.nil? -%>
|
85
89
|
chef.json = {}
|
86
90
|
<% else -%>
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: builderator
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.2.
|
4
|
+
version: 1.2.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- John Manero
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-
|
11
|
+
date: 2016-12-14 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rake
|