staypuft 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffc4713af541fbd45de1031951ef127af36cc43d
-  data.tar.gz: 74e411dad81c3260b1d636be7728443c7488863a
+  metadata.gz: 18a9a8aa4dbeac91c1b58bd703873461aa53198a
+  data.tar.gz: 8a8311dcb6ff38ffa3fa6f3286538059b362be15
 SHA512:
-  metadata.gz: 25789e7b3464ad1bdb69777ff80f23f9c5723d33e2c26f544f661f5c00eadd6bba7a3fd65dda4a7a8f25aa060792839fccd30eaee5b8867d5d994d78a28c0c1d
-  data.tar.gz: 227301210b654338dc414554bc5b32684ca0719052261003227f05f06e0ec75f850a975ce1702710f844b558f184a11470d61f01234ca708306a3c6977e2e8e2
+  metadata.gz: 1ccd0d9a1e917e1820912ef93553713841fd9d98cad32416ee10782f76de0fab095aa39669b2d209a26155e19a52a25a5781173484177dd6d229f41e27305754
+  data.tar.gz: 76ec7bc0494fecbf09bd96ca9ca24648d6d17c6f47dc8aa8210697e1eddedf2ddffc789c818e5c6328b450ce4801c77103a65f85121071723fed463b26216841

data/app/controllers/staypuft/interface_assignments_controller.rb

@@ -3,7 +3,9 @@ module Staypuft
     layout false
     def index
       @deployment = Deployment.find(params[:deployment_id])
-      @hosts = Host::Managed.where(:id => params[:host_ids]).includes(:interfaces)
+      host_ids = params[:host_ids]
+      host_ids = host_ids.split(',') unless host_ids.is_a? Array
+      @hosts = Host::Managed.where(:id => host_ids).includes(:interfaces)
       @subnets = @deployment.subnets.uniq
       @host = @hosts.first
       @interfaces = @host ? @host.interfaces.where("type <> 'Nic::BMC'").non_vip.order(:identifier).physical : []
@@ -23,7 +25,9 @@ module Staypuft
     def create
       @errors = {}
       @deployment = Deployment.find(params[:deployment_id])
-      @hosts = Host::Managed.where(:id => params[:host_ids])
+      host_ids = params[:host_ids]
+      host_ids = host_ids.split(',') unless host_ids.is_a? Array
+      @hosts = Host::Managed.where(:id => host_ids)
       @hosts.each do |host|
         @interface = host.interfaces.find_by_identifier(params[:interface]) || host
         @subnet = Subnet.find(params[:subnet_id])
@@ -37,7 +41,9 @@ module Staypuft
     def destroy
       @errors = {}
       @deployment = Deployment.find(params[:deployment_id])
-      @hosts = Host::Managed.where(:id => params[:host_ids])
+      host_ids = params[:host_ids]
+      host_ids = host_ids.split(',') unless host_ids.is_a? Array
+      @hosts = Host::Managed.where(:id => host_ids)
       @hosts.each do |host|
         @interface = host.interfaces.find_by_identifier(params[:interface]) || host
         @subnet = Subnet.find(params[:subnet_id])
@@ -71,7 +77,7 @@ module Staypuft
     end
 
     def get_interfaces_to_compare(host)
-      host.interfaces.where("type <> 'Nic::BMC'").order(:identifier)
+      host.interfaces.non_vip.where("type <> 'Nic::BMC'").order(:identifier)
     end
   end
 end

data/app/lib/staypuft/network_query.rb

@@ -58,7 +58,7 @@ module Staypuft
     end
 
     def controller_ip(subnet_type_name)
-      ip_for_host(controllers.tap { |v| v.size == 1 or raise }.first, subnet_type_name)
+      ip_for_host(controllers.tap { |v| v.size == 1 or raise('only one controller is allowed') }.first, subnet_type_name)
     end
 
     def controller_fqdns

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

@@ -148,14 +148,14 @@ module Staypuft
       if self.deployment.ha?
         params.delete :backend_lvm
       end
-      unless params.detect(lambda { false }) { |field| field }
-        errors[:base] << _("At least one storage backend must be selected")
+      unless params.detect(lambda { false }) { |field| self.send(field) == "true" }
+        errors.add :base, _("At least one storage backend must be selected")
       end
     end
 
     def equallogic_backends
       unless self.eqlxs.all? { |item| item.valid? }
-        errors[:base] << _("Please fix the problems in selected backends")
+        errors.add :base, _("Please fix the problems in selected backends")
       end
     end
   end

data/app/views/staypuft/steps/_cinder.html.erb

@@ -2,7 +2,8 @@
   <h5><%= _(Staypuft::Deployment::CinderService::DriverBackend::HUMAN) %></h5>
   <div class="col-md-12 clearfix cinderPicker" id="cinderPicker">
     <%= f.fields_for :cinder, @deployment.cinder do |p| %>
-
+      <%= base_errors_for @deployment.cinder %>
+      <div class="form-group <%= @deployment.cinder.errors.empty? ? "" : 'has-error' %> hide"></div>
       <%= check_box_f_non_inline(p, :backend_nfs,
                                  :checked_value   => 'true',
                                  :unchecked_value => 'false',

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.3.2'
+  VERSION = '0.3.3'
 end

metadata

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