staypuft 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45b52d5a9c0aa95ff9d31fbef3c20b491d000a1b
-  data.tar.gz: b901b85c5ab666ed79303e20ef127f76cf928607
+  metadata.gz: 3b0e05b324e38d1dc083bdd6ed82f0fcd0859991
+  data.tar.gz: 931bb580e72de0778a64de04601808ac5c2a1d01
 SHA512:
-  metadata.gz: f63308f66381fc965dfe19a7718925494295d4e7f7a76ee1fbb4123f1cd12d1a993ce4854151cfa9c5004525e9c59ce8aae9eaaa3a4e4bb78680c6eba758f5ee
-  data.tar.gz: 6eb41ec18540190e04906eb24c94c684b0273f53174b26244ee9ca40361cb2e36761eee3946a168d2ece55bb69d2eb97dc3023429739bb8944bbe8161e298d2f
+  metadata.gz: ee8c8ccff0fb497adce623790cbd4dc48e074b55670a73cade664c962c8010547095681b6c782dd14c123fc7deab89fcbc77b3dfb97d1e268f215e605ee0bf65
+  data.tar.gz: 0d259f68904d837a3377c3dbd022ff187678c8cae3b0aecd8dc2669f3f5f3666b348a2281b7661ab01ef2e7028fe053ff08f813e3ff614c5dabb632d311f7a98

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

@@ -17,6 +17,11 @@ module Staypuft
         self.facts_hash["processorcount"]
       end
 
+      # Returns model
+      def model_type
+        self.facts_hash["hardwaremodel"]
+      end
+
       # Returns array of NIC names
       def network_interfaces
         if self.facts_hash["interfaces"]

data/app/models/staypuft/deployment.rb

@@ -22,7 +22,6 @@ module Staypuft
     belongs_to :layout
 
     # needs to be defined before hostgroup association
-    before_destroy :prepare_destroy
     belongs_to :hostgroup, :dependent => :destroy
 
     has_many :deployment_role_hostgroups, :dependent => :destroy
@@ -318,10 +317,5 @@ module Staypuft
       self.form_step = Deployment::STEP_COMPLETE if self.form_step.to_sym == Deployment::STEP_CONFIGURATION
     end
 
-    def prepare_destroy
-      hosts.each &:open_stack_unassign
-      child_hostgroups.each &:destroy
-    end
-
   end
 end

data/app/models/staypuft/deployment_role_hostgroup.rb

@@ -12,8 +12,15 @@ module Staypuft
     validates :role_id, :uniqueness => {:scope => :deployment_id}
     validates :hostgroup, :presence => true
     validates :hostgroup_id, :uniqueness => true
+    has_many :hosts, :through => :hostgroup
 
     validates  :deploy_order, :presence => true
 
+    before_destroy :prepare_destroy
+
+    def prepare_destroy
+      hosts.each &:open_stack_unassign
+    end
+
   end
 end

data/app/views/staypuft/deployments/_assigned_hosts.html.erb

@@ -14,6 +14,10 @@
             <%= tag :input, type: 'checkbox', class: 'check_all' %>
           </th>
           <th><%= sort :name, :as => _('Name') %></th>
+          <th><%= _("Deployment Role") %></th>
+          <th><%= _("CPUs") %><br/><span class="text-muted small"><%= _("(cores)") %></span></th>
+          <th><%= _("Memory") %><br/><span class="text-muted small"><%= _("(GB)") %></span></th>
+          <th><%= _("NICs") %></th>
           <th class="hidden-s hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>
         </tr>
       </thead>
@@ -29,6 +33,12 @@
             <td class="ellipsis">
              <%= host_label(host) %>
             </td>
+            <td class="ellipsis">
+              <%= link_to(host.hostgroup.role, hosts_path(:search => "os_description = #{host.hostgroup.role}")) if host.hostgroup %>
+            </td>
+            <td><%= host.cpus %></td>
+            <td><%= host.mem %></td>
+            <td><%= host.network_interfaces.join('<br/>') if host.network_interfaces %></td>
             <td class="hidden-s hidden-xs"><%= host.ip %></td>
           </tr>
         <% end %>

data/app/views/staypuft/deployments/_assigned_hosts_table.html.erb

@@ -1,9 +1,9 @@
 <div class="tab-pane" id="<%= child_hostgroup.name.parameterize.underscore %>_assigned_hosts">
   <% if child_hostgroup.hosts.present? %>
     <%= form_tag(unassign_host_deployment_path(id: deployment), class: 'form-horizontal well association') do |f| %>
-      <%= submit_tag _("Unassign Hosts"), :class => "btn btn-primary btn-sm pull-left" %>
       <h4 class="pull-left"><%= _("Assigned Hosts") %></h4>
-      <button type="button" class="close" aria-hidden="true">×</button>
+      <button type="button" class="close pull-right" aria-hidden="true">&nbsp;&nbsp;×</button>
+      <%= submit_tag _("Unassign Hosts"), :class => "btn btn-primary btn-sm pull-right" %>
       <p class="clearfix"></p>
       <%= hidden_field_tag :hostgroup_id, child_hostgroup.id %>
       <table class="table table-bordered table-striped table-condensed">

data/app/views/staypuft/deployments/_deployed_hosts.html.erb

@@ -14,7 +14,10 @@
             <%= tag :input, type: 'checkbox', class: 'check_all' %>
           </th>
           <th><%= sort :name, :as => _('Name') %></th>
-          <th class="hidden-s hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>
+          <th><%= _("Operating System") %></th>
+          <th><%= _("Model") %></th>
+          <th><%= _("Deployment Role") %></th>
+          <th><%= _("Last Report") %></th>
         </tr>
       </thead>
       <tbody>
@@ -29,7 +32,14 @@
             <td class="ellipsis">
              <%= host_label(host) %>
             </td>
-            <td class="hidden-s hidden-xs"><%= host.ip %></td>
+            <td class="ellipsis">
+              <%= link_to(host.os.to_label, hosts_path(:search => "os_description = #{host.os.description}")) if host.os %>
+            </td>
+            <td><%= host.model_type %></td>
+            <td class="ellipsis">
+              <%= link_to(host.hostgroup.role, hosts_path(:search => "os_description = #{host.hostgroup.role}")) if host.hostgroup %>
+            </td>
+            <td><%= host.last_report %></td>
           </tr>
         <% end %>
       </tbody>

data/app/views/staypuft/deployments/_free_hosts.html.erb

@@ -15,6 +15,10 @@
             <%= tag :input, type: 'checkbox', class: 'check_all' %>
           </th>
           <th><%= sort :name, :as => _('Name') %></th>
+          <th><%= _("Operating System") %></th>
+          <th><%= _("CPUs") %><br/><span class="text-muted small"><%= _("(cores)") %></span></th>
+          <th><%= _("Memory") %><br/><span class="text-muted small"><%= _("(GB)") %></span></th>
+          <th><%= _("NICs") %></th>
           <th class="hidden-s hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>
         </tr>
       </thead>
@@ -30,6 +34,12 @@
             <td class="ellipsis">
              <%= host_label(host) %>
             </td>
+            <td class="ellipsis">
+              <%= link_to(host.os.to_label, hosts_path(:search => "os_description = #{host.os.description}")) if host.os %>
+            </td>
+            <td><%= host.cpus %></td>
+            <td><%= host.mem %></td>
+            <td><%= host.network_interfaces.join('<br/>') if host.network_interfaces %></td>
             <td class="hidden-s hidden-xs"><%= host.ip %></td>
           </tr>
         <% end %>

data/lib/staypuft/version.rb

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

metadata

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