knife-stackbuilder 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 278edc9ab005e30e5b5da72cd13e7e28a49df655
-  data.tar.gz: 0ee5c8dc89f98d4cfdcd6d0db3cd040789fa2a52
+  metadata.gz: aedb4132378ee68d7c8e56a485173de58d61a428
+  data.tar.gz: 9fa027941863f5f08a5bdc41944256fbf728a348
 SHA512:
-  metadata.gz: 463be1cca68ecdc686bb7f4e985b2e7f79a8e443605b142078a1fc2be0891327fa68b35be85a8283fdda7750ff789b5eaa38b299fa631b96eeba4de5cd2dc11a
-  data.tar.gz: 9336cb38c175d9cc6daaf14b70883adb13038c7ec1e7d323754e44b651d70309731ea908d85bdcd5f917b6f37a5f5e2e6592c182a33bbe2cd92922121830e340
+  metadata.gz: db532af7b3a449f18f47724bc7c098440cfd0f0aeda34eb6434701db013603295e3445168f9124cea1b49fc6ec21ae821275275d62b19f40f366101368d5c879
+  data.tar.gz: 72b4d0c1b30a929468d089d8530cd1063904eee27e4bb58b300a64d76fa1bbaa2787305229a79664a9bbfa624fb466e3643eacce75e5f6c403fabc0d7dd23f7c

data/lib/stackbuilder/chef/repo.rb

@@ -42,7 +42,7 @@ module StackBuilder::Chef
 
                 @environments = [ ]
                 Dir["#{@repo_path}/environments/**/*.rb"].each do |envfile|
-                    @environments << envfile[/\/(\w+).rb$/, 1]
+                    @environments << File.basename(envfile, ".rb")
                 end
 
                 @logger.debug("Found stack environments #{@environments}")
@@ -119,6 +119,8 @@ module StackBuilder::Chef
             knife_cmd = Chef::Knife::DataBagList.new
             data_bag_list = run_knife(knife_cmd).split
 
+            environments = (environment.nil? ? @environments : [ environment ])
+
             # Create environment specific data bags to hold certificates
             @environments.each do |env_name|
 

data/lib/stackbuilder/chef/stack_container_node.rb

@@ -30,7 +30,14 @@ module StackBuilder::Chef
 
             target_node_instance = "#{target.node_id}-#{index}"
             node = Chef::Node.load(target_node_instance)
-            ipaddress = node.attributes['ipaddress']
+
+            if @knife_config.has_key?('ip_attribute')
+
+                v = lambda { |h,k| k.size>1 ? v.call(h[k.shift],k) : h[k.shift] }
+                ipaddress = v.call(node.attributes, @knife_config['ip_attribute'].split('.'))
+            else
+                ipaddress = node.attributes['ipaddress']
+            end
 
             ssh = ssh_create(ipaddress, target.ssh_user,
                 target.ssh_password.nil? ? target.ssh_identity_file : target.ssh_password)

data/lib/stackbuilder/chef/stack_generic_node.rb

@@ -54,6 +54,8 @@ module StackBuilder::Chef
             config_knife(knife_cmd, knife_config['delete']['options'] || { })
             config_knife(knife_cmd, knife_config['options'] || { })
 
+            knife_cmd.config[:yes] = true
+
             if knife_config['delete']['synchronized']
                 @@sync ||= Mutex.new
                 @@sync.synchronize {

data/lib/stackbuilder/chef/stack_node_manager.rb

@@ -213,7 +213,9 @@ module StackBuilder::Chef
 
         def knife_ssh(name, cmd)
 
-            sudo = @knife_config['options']['sudo'] ? 'sudo -i su -c ' : ''
+            knife_config_options = @knife_config['options'] || { }
+
+            sudo = knife_config_options['sudo'] ? 'sudo -i su -c ' : ''
 
             ssh_cmd = "TMPFILE=`mktemp` && " +
                 "echo -e \"#{cmd.gsub(/\"/, "\\\"").gsub(/\$/, "\\$").gsub(/\`/, '\\' + '\`')}\" > $TMPFILE && " +
@@ -223,9 +225,9 @@ module StackBuilder::Chef
 
             knife_cmd = Chef::Knife::Ssh.new
             knife_cmd.name_args = [ "name:#{name}", ssh_cmd ]
-            knife_cmd.config[:attribute] = 'ipaddress'
+            knife_cmd.config[:attribute] = knife_config_options['ip_attribute'] || 'ipaddress'
 
-            config_knife(knife_cmd, @knife_config['options'] || { })
+            config_knife(knife_cmd, knife_config_options)
 
             if @logger.info? || @logger.debug?
 

data/lib/stackbuilder/chef/stack_provider.rb

@@ -40,6 +40,12 @@ module StackBuilder::Chef
             raise ArgmentError, "Stack file is fixed to the environment '#{stack_environment}', " +
                 " which it does not match the environment '#{@environment}' provided." \
                 unless stack_environment.nil? || stack_environment==@environment
+
+            unless stack['chef'].nil?
+
+                stack['chef']['knife_config'].each { |k,v| Chef::Config[:knife][k.to_sym] = v } \
+                    if stack['chef'].has_key?('knife_config')
+            end
         end
 
         def get_env_vars

data/lib/stackbuilder/resources/Environment.rb.erb

@@ -1,7 +1,9 @@
-name "<%= @environment %>"
-description "Chef '<%= @environment %>' environment."
+env_name = File.basename( __FILE__, ".rb")
 
-env = YAML.load_file(File.expand_path('../../etc/<%= @environment %>.yml', __FILE__))
+name env_name
+description "Chef '#{env_name}' environment."
+
+env = YAML.load_file(File.expand_path("../../etc/#{env_name}.yml", __FILE__))
 
 override_attributes(
 

data/lib/stackbuilder/version.rb

@@ -2,7 +2,7 @@
 
 module Knife
     module StackBuilder
-        VERSION = "0.5.7"
+        VERSION = "0.5.8"
         MAJOR, MINOR, TINY = VERSION.split('.')
     end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-stackbuilder
 version: !ruby/object:Gem::Version
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors:
 - Mevan Samaratunga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-31 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef