opzworks 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b900b683b64fe28a7b7fe4a8821e1f670a8bedcc
-  data.tar.gz: 49542f086fba79c2992f4f0fbe017568c5457740
+  metadata.gz: f769a4874e232e192be19c8fb468ea8242a620d0
+  data.tar.gz: d14aa92875d879a41cbab51d7323b596c85a2d22
 SHA512:
-  metadata.gz: 8505d8db7dfc0320907668050191e0aaaed915f5772aa20abe6a157ebe48bf3e311af2fdf20b675b62b2fd19d9c55e06d9eca7d9f5907c0f0a75632cf3fd16a8
-  data.tar.gz: 7d708dc4ddd78d77ee84610ce03d61d85e3d8c5dafa1ab62811ace577cce6c3858072e0a0c890ab7a4ddb4cf5ddcab519aa42c9594b990b48cb6926914a2d633
+  metadata.gz: 157cc2f33e2af666ac7e7f36ceb23eedc7ac17e6caed66bc35b84f10ab5e7df27ba4b65bd6a9fbd6a99bcb562305f1252a147b266d97aaebc968e71d0f504323
+  data.tar.gz: 62121775ae8fb5eddc957d5e88d90189e231426dd95c62258da8f0d025616563b798f47c0525e0b0a30e3cfe9b09c57a0d09fc648056d28d44fe6efa414c1a4b

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 changelog
 =========
 
+0.3.7
+-----
+* elastic code enhancements, including a timeout on ssh connect
+
 0.3.6
 -----
 * bug fix for elasticsearch 'start'

data/lib/opzworks/commands/elastic.rb

@@ -60,12 +60,14 @@ module OpzWorks
               puts "\n________________________________________________"
               puts "Now operating on host #{ip}".foreground(:yellow)
 
-              es_enable_allocation(ip, 'none') if @disable_shard_allocation == true
-              sleep 2 if @disable_shard_allocation == true
+              if @disable_shard_allocation
+                es_enable_allocation(ip, 'none')
+                sleep 2
+              end
 
               es_service('restart', [ip])
               es_wait_for_status(ip, 'yellow')
-              es_enable_allocation(ip, 'all') if @disable_shard_allocation == true
+              es_enable_allocation(ip, 'all') if @disable_shard_allocation
               es_wait_for_status(ip, 'green')
             end
           end
@@ -82,8 +84,10 @@ module OpzWorks
           case options[:stop]
           when true
             # use the first host to disable shard allocation
-            es_enable_allocation(@ip_addrs.first, 'none') if @disable_shard_allocation == true
-            sleep 2 if @disable_shard_allocation == true
+            if @disable_shard_allocation
+              es_enable_allocation(@ip_addrs.first, 'none')
+              sleep 2
+            end
 
             es_service('stop', @ip_addrs)
           end
@@ -91,13 +95,15 @@ module OpzWorks
           case options[:bounce]
           when true
             # use the first host to disable shard allocation
-            es_enable_allocation(@ip_addrs.first, 'none') if @disable_shard_allocation == true
-            sleep 2 if @disable_shard_allocation == true
+            if @disable_shard_allocation
+              es_enable_allocation(@ip_addrs.first, 'none')
+              sleep 2
+            end
 
             es_service('restart', @ip_addrs)
 
             es_wait_for_status(@ip_addrs.first, 'yellow')
-            es_enable_allocation(@ip_addrs.first, 'all') if @disable_shard_allocation == true
+            es_enable_allocation(@ip_addrs.first, 'all') if @disable_shard_allocation
             es_wait_for_status(@ip_addrs.first, 'green')
           end
         end

data/lib/opzworks/commands/include/elastic.rb

@@ -45,7 +45,7 @@ def es_get_input(input, data = {}, *cmd)
     options = {}
     if layer == ''
       puts 'Must specify a layer.'.foreground(:red)
-      abort
+      return false
     else
       options[:layer_id] = layer
     end
@@ -86,7 +86,9 @@ def es_service(command, ips = [])
       session.use "#{user}@#{ip}"
     end
 
-    session.exec "sudo service elasticsearch #{command}"
+    Timeout::timeout(10) do
+      session.exec "sudo service elasticsearch #{command}"
+    end
     session.loop
   end
 end

data/lib/opzworks/config.rb

@@ -1,4 +1,5 @@
 require 'inifile'
+require 'rainbow'
 
 module OpzWorks
   def self.config
@@ -12,7 +13,7 @@ module OpzWorks
     def initialize
       file = ENV['AWS_CONFIG_FILE'] || "#{ENV['HOME']}/.aws/config"
 
-      fail 'AWS config file not found' unless File.exist? file
+      fail 'AWS config file not found!'.foreground(:red) unless File.exist? file
       ini = IniFile.load(file)
 
       # set the region and the profile we want to pick up from ~/.aws/credentials

data/lib/opzworks/meta.rb

@@ -1,5 +1,5 @@
 module OpzWorks
-  VERSION     = '0.3.6'
+  VERSION     = '0.3.7'
   AUTHORS     = ['Grant Heffernan', 'Mapzen']
   EMAIL       = ['grant@mapzen.com']
   DESCRIPTION = 'OpzWorks Utilities'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opzworks
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Grant Heffernan