staypuft 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b0e05b324e38d1dc083bdd6ed82f0fcd0859991
-  data.tar.gz: 931bb580e72de0778a64de04601808ac5c2a1d01
+  metadata.gz: 649e6b74832134eb32e65dc093a3ee06a95f6f35
+  data.tar.gz: 2820cd2146364cba2011cb93183aa9043acef7d8
 SHA512:
-  metadata.gz: ee8c8ccff0fb497adce623790cbd4dc48e074b55670a73cade664c962c8010547095681b6c782dd14c123fc7deab89fcbc77b3dfb97d1e268f215e605ee0bf65
-  data.tar.gz: 0d259f68904d837a3377c3dbd022ff187678c8cae3b0aecd8dc2669f3f5f3666b348a2281b7661ab01ef2e7028fe053ff08f813e3ff614c5dabb632d311f7a98
+  metadata.gz: 277934325a63af0c682e8fc7c126e2e170b4582516eaa8f3cb2518498cedd39b23ef45e66beb52cecc1c0ea8e0b07cffdd1d6fd51fcff93c40821cf82fef7690
+  data.tar.gz: e18505d768ab7a0a876af874be7e3ff04fbea846cd95d21d0ff21475441b86022326b133660b140b59b6e80b55ebc2374e9220cdb9f00536d21cd69a0a323b45

data/app/lib/staypuft/seeder.rb

@@ -342,7 +342,6 @@ module Staypuft
               'swift_shared_secret'                     => swift_shared_secret,
               'swift_ringserver_ip'                     => '',
               'swift_storage_ips'                       => { :array => '<%= @host.deployment.ips.controller_ips %>' },
-              'cinder_nfs_shares'                       => [],
               'cinder_gluster_shares'                   => [],
               'controller_admin_host'                   => controller_host,
               'controller_priv_host'                    => controller_host,
@@ -416,7 +415,6 @@ module Staypuft
               'swift_shared_secret'                     => swift_shared_secret,
               'swift_ringserver_ip'                     => '',
               'swift_storage_ips'                       => { :array => '<%= @host.deployment.ips.controller_ips %>' },
-              'cinder_nfs_shares'                       => [],
               'cinder_gluster_shares'                   => [],
               'controller_admin_host'                   => controller_host,
               'controller_priv_host'                    => controller_host,

data/app/models/staypuft/concerns/host_details_helper.rb

@@ -5,8 +5,20 @@ module Staypuft
 
       # Returns memory in GB
       def mem
-        if self.facts_hash["memorytotal"]
-          self.facts_hash["memorytotal"].split(" ").first.to_f / 1000
+        mem_arr = self.facts_hash["memorytotal"]
+        if mem_arr
+          mem_str, mem_unit = mem_arr.split(" ")
+          mem_number = mem_str.to_f
+          case mem_unit
+          when "MB"
+            mem_number / 1024
+          when "GB"
+            mem_number
+          when "TB"
+            mem_number * 1024
+          else
+            nil
+          end
         else
           nil
         end

data/app/models/staypuft/deployment/ips.rb

@@ -1,5 +1,3 @@
-require 'resolv'
-
 module Staypuft
   class Deployment::IPS < Deployment::AbstractParamScope
 
@@ -12,9 +10,7 @@ module Staypuft
     end
 
     def controller_ips
-      controllers.map do |controller|
-        ip_for_controller(controller)
-      end
+      controllers.map &:ip
     end
 
     def controller_fqdns
@@ -22,15 +18,8 @@ module Staypuft
     end
 
     def controller_ip
-      ip_for_controller(controllers.tap { |v| v.size == 1 or raise }.first)
+      controllers.tap { |v| v.size == 1 or raise }.first.ip
     end
 
-    # TODO: a better fix is needed once we have explicit subnet support in staypuft
-    # This is needed because host.ip doesn't always return the expected ip address
-    # when the host has more than one network interface -- this ensures that the
-    # provisioning network interface is the chosen one.
-    def ip_for_controller(controller)
-      Resolv::DNS.new(:nameserver => 'localhost').getaddress(controller.fqdn).to_s
-    end
   end
 end

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks