staypuft 0.0.4 → 0.0.5

data/app/controllers/staypuft/deployments_controller.rb

@@ -53,17 +53,40 @@ module Staypuft
 
     def associate_host
       hostgroup = ::Hostgroup.find params[:hostgroup_id]
-      hosts     = Array(::Host::Base.find *params[:host_ids])
-      hosts.each do |host|
-        host           = host.becomes(::Host::Managed)
+
+      targeted_hosts  = Array(::Host::Base.find *params[:host_ids])
+      assigned_hosts  = hostgroup.hosts
+      hosts_to_assign = targeted_hosts - assigned_hosts
+      hosts_to_remove = assigned_hosts - targeted_hosts
+
+      hosts_to_assign.each do |discovered_host|
+        host           = discovered_host.becomes(::Host::Managed)
         host.type      = 'Host::Managed'
         host.managed   = true
         host.build     = false
         host.hostgroup = hostgroup
+
+        # root_pass is not copied for some reason
+        host.root_pass = hostgroup.root_pass
+
+        # I do not why but the final save! adds following condytion to the update SQL command
+        # "WHERE "hosts"."type" IN ('Host::Managed') AND "hosts"."id" = 283"
+        # which will not find the record since it's still Host::Discovered.
+        # Using #update_column to change it directly in DB
+        # (discovered_host is used to avoid same WHERE condition problem here).
+        # FIXME this is definitely ugly, needs to be properly fixed
+        discovered_host.update_column :type, 'Host::Managed'
+
         host.save!
       end
+
+      hosts_to_remove.each do |host|
+        host.hostgroup = nil
+        host.save!
+      end
+
       redirect_to deployment_path(id: ::Staypuft::Deployment.first)
     end
-
   end
+
 end

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

@@ -47,35 +47,44 @@
     <% @deployment.child_hostgroups.each_with_index do |child_hostgroup, i| %>
       <div class="tab-pane <%= 'active' if i == 0 %>" id="<%= child_hostgroup.name.parameterize.underscore %>">
         <h3><%= _("Hosts") %></h3>
-        <%= form_tag(associate_host_deployments_path, class: 'form-horizontal well association') do |f| %>
-          <p>
-            <%= submit_tag _("Apply"), :class => "btn btn-primary btn-sm" %>
-          </p>
-          <%= hidden_field_tag :hostgroup_id, child_hostgroup.id %>
-          <table class="table table-bordered table-striped table-condensed">
-            <thead>
-              <tr>
-                <th class="ca">
-                  <%= check_box_tag :check_all %>
-                </th>
-                <th><%= sort :name, :as => _('Name') %></th>
-                <th class="hidden-s hidden-xs"><%= sort :mac, :as => _('MAC Address') %></th>
-                <th class="hidden-s hidden-xs"><%= sort :type, :as => _('Type') %></th>
-              </tr>
-            </thead>
-            <tbody>
-              <% child_hostgroup.own_and_free_hosts.each do |host| %>
-                <tr class="checkbox_highlight <%= "success" if child_hostgroup.host_ids.include?(host.id) %>">
-                  <td class="ca">
-                    <%= check_box_tag "host_ids[]", host.id, child_hostgroup.host_ids.include?(host.id), :id => "host_ids_#{host.id}" %>
-                  </td>
-                  <td class="ellipsis"><%= host.name %></td>
-                  <td class="hidden-s hidden-xs"><%= host.mac %></td>
-                  <td class="hidden-s hidden-xs"><%= host.type %></td>
+        <% if child_hostgroup.own_and_free_hosts.present? %>
+          <%= form_tag(associate_host_deployments_path, class: 'form-horizontal well association') do |f| %>
+            <p>
+              <%= submit_tag _("Apply"), :class => "btn btn-primary btn-sm" %>
+            </p>
+            <%= hidden_field_tag :hostgroup_id, child_hostgroup.id %>
+            <table class="table table-bordered table-striped table-condensed">
+              <thead>
+                <tr>
+                  <th class="ca">
+                    <%= check_box_tag :check_all %>
+                  </th>
+                  <th><%= sort :name, :as => _('Name') %></th>
+                  <th class="hidden-s hidden-xs"><%= sort :mac, :as => _('MAC Address') %></th>
+                  <th class="hidden-s hidden-xs"><%= sort :type, :as => _('Type') %></th>
                 </tr>
-              <% end %>
-            </tbody>
-          </table>
+              </thead>
+              <tbody>
+                <% child_hostgroup.own_and_free_hosts.each do |host| %>
+                  <tr class="checkbox_highlight <%= "success" if child_hostgroup.host_ids.include?(host.id) %>">
+                    <td class="ca">
+                      <%= check_box_tag "host_ids[]", host.id, child_hostgroup.host_ids.include?(host.id), :id => "host_ids_#{host.id}" %>
+                    </td>
+                    <td class="ellipsis"><%= host.name %></td>
+                    <td class="hidden-s hidden-xs"><%= host.mac %></td>
+                    <td class="hidden-s hidden-xs"><%= host.type %></td>
+                  </tr>
+                <% end %>
+              </tbody>
+            </table>
+          <% end %>
+        <% else %>
+          <div class="well association">
+            <div class="alert alert-warning">
+              <span class="glyphicon glyphicon-warning-sign">&nbsp;</span>
+              <%= _("All available hosts have been already assigned.") %>
+            </div>
+          </div>
         <% end %>
       </div>
     <% end %>

data/config/staypuft.local.rb

@@ -1 +1,5 @@
 gemspec path: '../staypuft'
+
+gem 'foreman_discovery',
+    git:    'https://github.com/theforeman/foreman_discovery.git',
+    branch: 'develop'

data/db/seeds.rb

@@ -68,6 +68,7 @@ params = {
   "ovs_vlan_ranges"               => '',
   "ovs_bridge_mappings"           => [],
   "ovs_bridge_uplinks"            => [],
+  "ovs_tunnel_iface"              => 'eth0',
   "tenant_network_type"           => 'gre',
   "enable_tunneling"              => 'True',
   "ovs_vxlan_udp_port"            => '4789',

data/lib/staypuft/engine.rb

@@ -44,20 +44,14 @@ module Staypuft
     end
 
     initializer "load default settings" do |app|
-      if (Setting.table_exists? rescue(false))
+      if (Setting.table_exists? rescue false)
         Setting::StaypuftProvisioning.load_defaults
       end
     end
 
     initializer 'staypuft.configure_assets', :group => :assets do
-      SETTINGS[:staypuft] = {
-        :assets => {
-          :precompile => [
-            'staypuft/staypuft.js',
-            'staypuft/staypuft.css'
-          ],
-        }
-      }
+      SETTINGS[:staypuft] =
+          { assets: { precompile: %w(staypuft/staypuft.js staypuft/staypuft.css) } }
     end
 
   end

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
@@ -95,7 +95,6 @@ files:
 - app/lib/actions/staypuft/host/build.rb
 - app/lib/actions/staypuft/host/create.rb
 - app/lib/actions/staypuft/host/deploy.rb
-- app/lib/actions/staypuft/host/provision.rb
 - app/lib/actions/staypuft/host/puppet_run.rb
 - app/lib/actions/staypuft/host/wait_until_host_ready.rb
 - app/lib/actions/staypuft/host/wait_until_installed.rb

data/app/lib/actions/staypuft/host/provision.rb

@@ -1,50 +0,0 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
-module Actions
-  module Staypuft
-    module Host
-
-      # creates and provisions Host waiting until it's ready
-      class Provision < Actions::Base
-
-        middleware.use Actions::Staypuft::Middleware::AsCurrentUser
-
-        def plan(name, hostgroup, compute_resource)
-          Type! hostgroup, ::Hostgroup
-          Type! compute_resource, ComputeResource
-
-          input[:name] = name
-
-          sequence do
-            creation = plan_action Host::Create, name, hostgroup, compute_resource
-            plan_action Host::Build, creation.output[:host][:id]
-            plan_action Host::WaitUntilInstalled, creation.output[:host][:id]
-            # TODO: wait until restarted
-          end
-        end
-
-        def humanized_input
-          input[:name]
-        end
-
-        def task_output
-          planned_actions(Host::Create).first.output
-        end
-
-        def humanized_output
-          task_output.fetch(:host, {})[:name]
-        end
-      end
-    end
-  end
-end