image_builder 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94194ecb8b93c94713d7105ef4070e3f0646b90a
-  data.tar.gz: f3b146ec098b7c35c0260948e2843a1de2a56709
+  metadata.gz: c076dc7e5e4320113bec0ce82b53fcec8002ae27
+  data.tar.gz: 9bd05d5459f560cc94e16019e8e72e9a0538197f
 SHA512:
-  metadata.gz: 743c1e8f0a5c4132e6866e22462799c069e8ac8396bc1377e0fdd352b39ec0fffb98d2c406c56853af5bbc86f6bd350a8fb19fbcf23414109645189d4b6accd6
-  data.tar.gz: 102fcbe10ee97557181576aa4f2c1e57607172284f9931fd46efeaaeb3b2cc010ce3d452616918b33b088fce63a2a08a2b8a3a500d10ab46808ced250c328f47
+  metadata.gz: c42e8773beedd7438cc73339eadf0b2688d838b8689a3ed41cf2eb5afe2a32d2da43e2777bfb1b2b4901a8ee5d01b5d76345827ca02b3ce746f264ad1fed07ae
+  data.tar.gz: 6c905f1c8247edd709d4d972896e4a89f0173f2eff53ecc61a7ef23103951f59d54793555e2686b9b1acca475218affe58571b75234e36d933cb3ec5a5b01000

data/bin/image_builder

@@ -34,6 +34,7 @@ end
 def create_chef_client_provisioner(knife_file, chef_attrs, options)
   chef_client_prov = ImageBuilder::Provisioners::Chef::Client.from_file(knife_file)
   chef_client_prov.chef_environment = chef_attrs['amibakery']['build']['chef_env']
+  chef_client_prov.chef_version = options.chef_version
   chef_client_prov.node_name = "#{prog_name}_{{uuid}}"
   chef_client_prov.run_list  = options.r_run_list
   chef_client_prov.json = JSON.parse(options.j_json) # Placeholder for custom json used to pass in build-specific data
@@ -176,6 +177,7 @@ Commander.configure do
     c.option '--ami-description DESC', String, 'A description of the ami'
     c.option '--cleanup-run-list RUN_LIST', Array, 'A run-list used to clean up the provisioned node before AMI creation'
     c.option '--[no-]vagrant-box', 'Create a Vagrant box defintion after the build completes'
+    c.option '--chef-version', String, 'chef-client version to download and install. If not given, will download the latest version'
 
     c.action do |_args, options|
       options.default vagrant_box: false

data/lib/image_builder/provisioners/chef_base.rb

@@ -7,6 +7,7 @@ module ImageBuilder
     module Chef
       # Generic class doc comment
       class Base < ImageBuilder::Provisioners::Base
+        attr_accessor :chef_version
         attr_accessor :cookbook_paths
         attr_accessor :config_template
         attr_accessor :encrypted_data_bag_secret_path
@@ -59,6 +60,9 @@ module ImageBuilder
         def packer_hash
           hash = { type: @type }
 
+          @install_command = 'curl -L https://www.opscode.com/chef/install.sh | ' \
+            '{{if .Sudo}}sudo{{end}} bash -s -- -v ' + @chef_version unless @chef_version.nil? && @install_command.nil?
+
           attr_to_hash(hash, :config_template)
           attr_to_hash(hash, :execute_command)
           attr_to_hash(hash, :install_command)

data/lib/image_builder/version.rb

@@ -1,4 +1,4 @@
 # Generic top-level module comment
 module ImageBuilder
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/spec/chef_client_provisioner_spec.rb

@@ -29,4 +29,17 @@ describe ImageBuilder::Provisioners::Chef::Client do
   it 'implements packer_hash()' do
     expect(@obj.respond_to? :packer_hash).to be true
   end
+
+  it 'behaves correctly when no chef version given' do
+    expect(@obj.packer_hash.key? :install_command).to be false
+    expect(@obj.packer_hash[:install_command]).to be_nil
+  end
+
+  it 'honors setting a chef version for install' do
+    version = '11.16'
+    @obj.chef_version = version
+    expect(@obj.packer_hash.key? :install_command).to be true
+    expect(@obj.packer_hash[:install_command]).to match(/\s+-v\s+#{version}/)
+    expect(@obj.install_command).to match(/\s+-v\s+#{version}/)
+  end
 end

data/spec/chef_solo_provisioner_spec.rb

@@ -25,4 +25,17 @@ describe ImageBuilder::Provisioners::Chef::Solo do
   it 'implements packer_hash()' do
     expect(@obj.respond_to? :packer_hash).to be true
   end
+
+  it 'behaves correctly when no chef version given' do
+    expect(@obj.packer_hash.key? :install_command).to be false
+    expect(@obj.packer_hash[:install_command]).to be_nil
+  end
+
+  it 'honors setting a chef version for install' do
+    version = '11.14'
+    @obj.chef_version = version
+    expect(@obj.packer_hash.key? :install_command).to be true
+    expect(@obj.packer_hash[:install_command]).to match(/\s+-v\s+#{version}/)
+    expect(@obj.install_command).to match(/\s+-v\s+#{version}/)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_builder
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Mike Morris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler