etoro_utility_mcollective 0.2.0 → 0.2.1

data/lib/etoro/utility/mcollective/haproxy.rb

@@ -49,6 +49,10 @@ module Etoro
 
           begin
             timeout(@config[:timeout]) do
+              if @haproxy_status.length == 0
+                @logger.error('No HAProxy or HAProxy Entry Found')
+                raise 'No HAProxy or HAProxy Entry Found'
+              end
               until @haproxy_status == {}
                 @haproxy_status.each do |host, status|
                   run = rpcclient(self.class.name.downcase.split('::').last, :chomp => true)
@@ -68,7 +72,7 @@ module Etoro
               end
             end
             rescue Timeout::Error
-            @logger.error("HAProxy run timed out. Took more than #{@config[:timeout]} seconds")
+              @logger.error("HAProxy run timed out. Took more than #{@config[:timeout]} seconds")
           end
         end
       end

data/lib/etoro/utility/mcollective/puppet.rb

@@ -29,6 +29,10 @@ module Etoro
         def check_run_status
           @logger.info("Checking for Puppet run completion")
           exit_flag = false
+          if @last_run_puppet.length == 0
+            @logger.error("No Hosts Defined")
+            raise "No Hosts Defined"
+          end
           begin
             timeout(@config[:timeout]) do
               until @last_run_puppet == {}
@@ -61,7 +65,7 @@ module Etoro
 
           if exit_flag == true then
             @logger.error("Puppet run failed")
-            exit 1
+            raise Timeout::Error
           end
         end
       end

data/lib/etoro_utility_mcollective/version.rb

@@ -1,3 +1,3 @@
 module EtoroUtilityMcollective
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etoro_utility_mcollective
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &5996560 !ruby/object:Gem::Requirement
+  requirement: &12917160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *5996560
+  version_requirements: *12917160
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &5996020 !ruby/object:Gem::Requirement
+  requirement: &12916680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5996020
+  version_requirements: *12916680
 - !ruby/object:Gem::Dependency
   name: mcollective
-  requirement: &5995400 !ruby/object:Gem::Requirement
+  requirement: &12916060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *5995400
+  version_requirements: *12916060
 description: test
 email:
 - alon@etoro.com