mccloud 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5bacf91d6f8f389037a21d621daf768753e089e
-  data.tar.gz: b259dbf41df65a041c16ba2b41676be8a7893c67
+  metadata.gz: 3c6517d800261185b44916b4ce87b82e1473edfb
+  data.tar.gz: 19f142b6ab99c7d7f3642b02d190f312b9ac4ca1
 SHA512:
-  metadata.gz: aba73b0005719dc0192ee7540433183431cbd076800fca9f35e2dd946f09f60c523055b309a4c504da3f2fb1ec3928533b14ad79b69b46fc06b33a9b97fa97a1
-  data.tar.gz: 705235cf7c5abc4d4f580900132637faed4051f1fcd6544650a70a0a340e13124602dd38e7b90012319d2cac0028660143c18f3b355c57f6c85a7ee2b305e42d
+  metadata.gz: c148c5ddbf827c515165422ae3118d44cc9cdd515c9b266c9218a3ff16d12b0043e54ac9c0c9f9f3aab1faccd430bbc1c4b39f867ff02c491289b997c3026066
+  data.tar.gz: e1051308a49abbd9d453face8751746523f980f9d7998a948f1687dbbc37a20810639e5a9b76ab8501ae043e9d98ecc305678e3934469fa2da10ad62b5db8e2e

data/lib/mccloud/provider/aws/provider.rb

@@ -213,6 +213,19 @@ module Mccloud
 
         end
 
+        def hosts
+          hostentries = Hash.new
+          filter = self.filter
+
+          self.raw.servers.each do |s|
+            name = s.tags["Name"].sub(/^#{filter}/,'')
+            hostentries = Hash.new
+            hostentries[name]=s.public_ip_address
+            hostentries[name]=s.private_ip_address
+          end
+          return hostentries
+        end
+
       end
     end
   end

data/lib/mccloud/provider/core/provider.rb

@@ -67,6 +67,16 @@ module Mccloud
           end
         end
 
+        def hosts
+          hostentries = Hash.new
+          self.vms.each do |name,vm|
+           hostentries[name] = Hash.new
+           hostentries[name]['public_ip_address'] = vm.public_ip_address
+           hostentries[name]['private_ip_address'] = vm.private_ip_address
+          end
+          return hostentries
+        end
+
         #TODO this loading of gem , needs to be moved else where
         #This provider should only check what it needs
 

data/lib/mccloud/provisioner/chef_solo.rb

@@ -57,10 +57,35 @@ module Mccloud
 
           public_ips=Hash.new
           private_ips=Hash.new
+
+          providers = Hash.new
+          # Add all providers
           server.provider.vms.each do |name,vm|
-            public_ips[name]=vm.public_ip_address
-            private_ips[name]=vm.private_ip_address
+            providers[vm.provider.name] = vm.provider if providers[vm.provider.name].nil?
+          end
+
+          providers.each do |providername,provider|
+            hosts = providers[providername].hosts
+            hosts.each do |name,host|
+              public_ips[name]=host['public_ip_address']
+              private_ips[name]=host['private_ip_address']
+            end
+          end
+
+=begin
+
+          # For each provider , get the ip-addresses
+          providers.each do |providername, provider|
+            #namespace = provider.namespace
+            filter = provider.filter
+
+            provider.raw.servers.each do |s|
+              name = s.tags["Name"].sub(/^#{filter}/,'')
+              public_ips[name]=s.public_ip_address
+              private_ips[name]=s.private_ip_address
+            end
           end
+=end
 
           # http://www.techques.com/question/1-3242470/Problem-using-OpenStruct-with-ERB
           # We only want specific variables for ERB

data/lib/mccloud/version.rb

@@ -2,5 +2,5 @@ module Mccloud
 end
 
 unless defined?(Mccloud::VERSION)
-  ::Mccloud::VERSION = "0.0.23"
+  ::Mccloud::VERSION = "0.0.24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mccloud
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - Patrick Debois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh