knife-nodefu 0.1.1 → 0.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/chef/knife/nodefu_create.rb +7 -4
 - data/lib/knife-nodefu/version.rb +1 -1
 - metadata +2 -2
 
| 
         @@ -76,7 +76,7 @@ class NodefuCreate < Chef::Knife 
     | 
|
| 
       76 
76 
     | 
    
         
             
                check_args(1)
         
     | 
| 
       77 
77 
     | 
    
         | 
| 
       78 
78 
     | 
    
         
             
                env            = Chef::Config[:environment]  
         
     | 
| 
       79 
     | 
    
         
            -
                defs_dir       = Chef::Config[:nodefu_definitions] || config[: 
     | 
| 
      
 79 
     | 
    
         
            +
                defs_dir       = Chef::Config[:nodefu_definitions] || config[:definitions] 
         
     | 
| 
       80 
80 
     | 
    
         
             
                yml_config     = definitions_from_directory defs_dir
         
     | 
| 
       81 
81 
     | 
    
         
             
                merged_config  = Chef::Mixin::DeepMerge.merge(yml_config['default'],yml_config['env'][env])
         
     | 
| 
       82 
82 
     | 
    
         
             
                node_spec_name = config[:node_spec] || base_name 
         
     | 
| 
         @@ -101,6 +101,7 @@ class NodefuCreate < Chef::Knife 
     | 
|
| 
       101 
101 
     | 
    
         
             
                abort("See ya!") unless (['yes','y',].include?(user_response))
         
     | 
| 
       102 
102 
     | 
    
         | 
| 
       103 
103 
     | 
    
         
             
                threads = []   
         
     | 
| 
      
 104 
     | 
    
         
            +
                sema = Mutex.new
         
     | 
| 
       104 
105 
     | 
    
         
             
                for i in (start_range..end_range)
         
     | 
| 
       105 
106 
     | 
    
         
             
                  ec2_server_request = Ec2ServerCreate.new
         
     | 
| 
       106 
107 
     | 
    
         
             
                  node_name = "#{base_name}#{i}"
         
     | 
| 
         @@ -120,12 +121,14 @@ class NodefuCreate < Chef::Knife 
     | 
|
| 
       120 
121 
     | 
    
         
             
                  threads << Thread.new(full_node_name,ec2_server_request) do |full_node_name,request|
         
     | 
| 
       121 
122 
     | 
    
         
             
                    e = nil
         
     | 
| 
       122 
123 
     | 
    
         
             
                    begin 
         
     | 
| 
       123 
     | 
    
         
            -
             
     | 
| 
      
 124 
     | 
    
         
            +
                        request.run
         
     | 
| 
       124 
125 
     | 
    
         
             
                    rescue => e 
         
     | 
| 
       125 
126 
     | 
    
         
             
                      config[:exit_on_fail] ? raise(e) : puts("#{full_node_name}: #{e.message}")
         
     | 
| 
       126 
127 
     | 
    
         
             
                    end 
         
     | 
| 
       127 
     | 
    
         
            -
                     
     | 
| 
       128 
     | 
    
         
            -
             
     | 
| 
      
 128 
     | 
    
         
            +
                    sema.synchronize {
         
     | 
| 
      
 129 
     | 
    
         
            +
                      [full_node_name, { 'server' => request.server, 'failure' => e, 'chef_node' => nil} ]
         
     | 
| 
      
 130 
     | 
    
         
            +
                    }
         
     | 
| 
      
 131 
     | 
    
         
            +
                    end        
         
     | 
| 
       129 
132 
     | 
    
         
             
                end
         
     | 
| 
       130 
133 
     | 
    
         
             
                threads.each(&:join)
         
     | 
| 
       131 
134 
     | 
    
         | 
    
        data/lib/knife-nodefu/version.rb
    CHANGED
    
    
    
        metadata
    CHANGED
    
    | 
         @@ -1,7 +1,7 @@ 
     | 
|
| 
       1 
1 
     | 
    
         
             
            --- !ruby/object:Gem::Specification
         
     | 
| 
       2 
2 
     | 
    
         
             
            name: knife-nodefu
         
     | 
| 
       3 
3 
     | 
    
         
             
            version: !ruby/object:Gem::Version
         
     | 
| 
       4 
     | 
    
         
            -
              version: 0.1. 
     | 
| 
      
 4 
     | 
    
         
            +
              version: 0.1.2
         
     | 
| 
       5 
5 
     | 
    
         
             
              prerelease: 
         
     | 
| 
       6 
6 
     | 
    
         
             
            platform: ruby
         
     | 
| 
       7 
7 
     | 
    
         
             
            authors:
         
     | 
| 
         @@ -9,7 +9,7 @@ authors: 
     | 
|
| 
       9 
9 
     | 
    
         
             
            autorequire: 
         
     | 
| 
       10 
10 
     | 
    
         
             
            bindir: bin
         
     | 
| 
       11 
11 
     | 
    
         
             
            cert_chain: []
         
     | 
| 
       12 
     | 
    
         
            -
            date: 2013- 
     | 
| 
      
 12 
     | 
    
         
            +
            date: 2013-04-22 00:00:00.000000000 Z
         
     | 
| 
       13 
13 
     | 
    
         
             
            dependencies:
         
     | 
| 
       14 
14 
     | 
    
         
             
            - !ruby/object:Gem::Dependency
         
     | 
| 
       15 
15 
     | 
    
         
             
              name: knife-ec2
         
     |