hazetug 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 232620443790901644f47f44c1904f61f3ce8733
-  data.tar.gz: 9221b8cb51f1ff8175b9c8c5ab07ab5cc029ec2b
+  metadata.gz: 723a5d37ca91b5fde0e80ec539e3d6a94c1acfdf
+  data.tar.gz: 8a73f894d14f9c9a91387e0cde7fa1027d7b5a57
 SHA512:
-  metadata.gz: 2e83f628063452264ff041902d822651060d066f468b65efaa3f949a8a35a0e2f6680111445731310ea20a326ba670b134fdcc9c9db7f430612067435dbe7a0f
-  data.tar.gz: d7b0c52a0c92af20398be2af7d08e213a380d1d1d5d9c82e6d955fc39a1d93c9ca70f56332edbdf3aa794fbf4022b5a68c2603e3bdb5e2458bc966e02fdcceaf
+  metadata.gz: 5c3e424bc320a7c7d0fd03fc3ddb882e32b0b265ff682b5960a726c5c079f303d9afd9c67cb810ffe2ce82a8ccdbace8df7de95259c2a6bc2ab896a8cc62ca14
+  data.tar.gz: 7992188b72be3ea5a17224c443ba7ad71806b5736f37ab06c75d56af9c0b9f2749ee781f03c6a37be0287bbad179606d545d9ae86dfda64456c5fc503b7daf43

data/lib/hazetug/cli/bootstrap.rb

@@ -43,30 +43,35 @@ class Hazetug
 
       def bootstrap_list(&block)
         return if block.nil?
-        task.hosts_to_bootstrap(env_split) do |conf|
-          num = conf[:number] || data[:opts][:number].to_i || 1
+        task.hosts_to_bootstrap(command_variables) do |conf|
+
           if convert_rand_name(conf[:name]) == conf[:name] && num > 1
             ui.fatal "Can't bootstrap several hosts with the same name"
             raise ArgumentError, "%rand(x)% expected"
           end
+
+          num = conf[:number] || data[:opts][:number].to_i || 1
           (1..num).each do
             newconf = conf.dup
             newconf[:name] = convert_rand_name(conf[:name])
+
             haze = Hazetug::Haze[data[:compute_name]].new(newconf)
-            # Ensure a dynamic password loaded back from haze
+            
             if haze.config[:ssh_password]
+              # Ensure a dynamic password loaded back from haze
               newconf[:ssh_password] = haze.config[:ssh_password]
             end
+
             tug  = Hazetug::Tug[data[:tug_name]].new(newconf, haze)
             block.call(haze, tug)
           end
         end
       end
 
-      def env_split
-        @env_split ||= begin
+      def command_variables
+        @command_variables ||= begin
           env = {}
-          arr = data[:opts][:env]
+          arr = data[:opts][:variables]
           if arr
             arr.each do |eq|
               k, v = eq.split('=')

data/lib/hazetug/haze/linode.rb

@@ -19,7 +19,8 @@ class Hazetug
       def create_server_args
         latest = /^Latest #{config[:bits]} bit/
         {
-          :name => config[:name],
+          # linode node name can't contain dots
+          :name => config[:name].gsub(/./,'-'),
           :data_center => lookup(:location),
           :flavor => lookup(:flavor),
           :image  => lookup(:image),

data/lib/hazetug/task.rb

@@ -23,11 +23,11 @@ class Hazetug
       @task[key]
     end
 
-    def hosts_to_bootstrap(env={}, &block)
+    def hosts_to_bootstrap(cmd_vars={}, &block)
       return if block.nil?
       base_conf = Mash.new(task)
       hosts = base_conf.delete(:bootstrap)
-      base_conf = Chef::Mixin::DeepMerge.merge(base_conf, env)
+      base_conf = Chef::Mixin::DeepMerge.merge(base_conf, cmd_vars)
       hosts.each do |conf|
         merged = Chef::Mixin::DeepMerge.merge(base_conf, conf)
         block.call(merged)

data/lib/hazetug/tug/knife.rb

@@ -48,7 +48,9 @@ class Hazetug
         end
         kb.name_args = [haze.server.ssh_ip_address]
         kb.run
-      ensure
+      rescue Hazetug::Exception => e
+        ui.error(e.message); 1
+      ensure  
         @kb and @kb.ui.stdout.close
       end
 
@@ -65,10 +67,17 @@ class Hazetug
 
       def bootstrap_options
         @bootstrap_options ||= begin
-          template = options[:opts][:bootstrap]
+          template = options[:opts][:bootstrap] || 'bootstrap.erb'
+          validation = config[:chef_validation_key] || 'validation.pem'
+
+          files = [template, validation].map {|f| File.expand_path(f)}
+          notfound = files.select {|f| !File.exist?(f)}
+          notfound.empty? or 
+            raise Hazetug::Exception, "File(s) not found: #{notfound.join(', ')}"
+
           opts = {}
-          opts[:validation_key] = File.expand_path(config[:chef_validation_key] || 'validation.pem')
-          opts[:template_file]  = File.expand_path(template || 'bootstrap.erb')
+          opts[:validation_key] = File.expand_path(validation)
+          opts[:template_file]  = File.expand_path(template)
           opts[:ssh_user] = config[:ssh_user] || 'root'
           opts[:ssh_password] = config[:ssh_password]
           opts[:environment]  =  config[:chef_environment]

data/lib/hazetug/version.rb

@@ -1,3 +1,3 @@
 class Hazetug
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hazetug
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Denis Barishev