staypuft 0.4.15 → 0.5.0

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

@@ -113,5 +113,8 @@
     <div class="row">
       <div class="col-sm-12 text-center"><h3 class="text-muted"><%= _("Not deployed, yet.") %></h3></div>
     </div>
+    <div class="row text-center">
+      <%= link_to(_("Access all details"), "", :'data-toggle' => "modal", :'data-target' => "#all_details_modal", :class => "btn btn-default") %>
+    </div>
   <% end %>
 </div>

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

@@ -8,5 +8,6 @@
   <% if local_assigns[:deploying_col] %>
     <th class="hidden-s hidden-xs"><%= _('Deploying?') %></th>
   <% end %>
+  <th class="hidden-s hidden-xs"><%= _('Managed?') %></th>
   <th class="hidden-s hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>
 </tr>

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

@@ -30,5 +30,13 @@
     </td>
   <% end %>
 
+  <td class="hidden-s hidden-xs">
+    <% if host.managed? %>
+      <span class="glyphicon glyphicon-ok"></span>
+    <% else %>
+      <span class="glyphicon glyphicon-minus"></span>
+    <% end %>
+  </td>
+
   <td class="hidden-s hidden-xs"><%= host.ip %></td>
 </tr>

data/app/views/staypuft/interface_assignments/_nics_assignment.html.erb

@@ -5,7 +5,7 @@
       <div class="panel-body">
         <% @subnets.each do |subnet| %>
           <% next if is_pxe?(@deployment, subnet) # we skip PXE network which is always on primary interface %>
-          <% next if @host.interfaces.non_vip.where(:subnet_id => subnet.id).present? # we skip assigned subnets %>
+          <% next if @host.interfaces.where(:subnet_id => subnet.id).present? # we skip assigned subnets %>
           <%= render 'staypuft/subnets/subnet_pull',
                      :subnet => subnet,
                      :deployment => @deployment,

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

@@ -54,7 +54,7 @@
             </a>
             <%= link_to _("Cancel"), deployment_path(@deployment),
                         :class => "btn btn-danger" %>
-            <%= button_tag(:type => 'submit', :class => "btn btn-primary pull-right") do %>
+            <%= button_tag(:type => 'submit', :class => "btn btn-primary pull-right", :id => "vip_modal_button" ) do %>
               <%= _("Next") %>
             <% end %>
           </div>
@@ -84,4 +84,15 @@
         </div>
       </div>
     </div>
+
+  <div class="modal fade" id="vip_modal" tabindex="-1" role="dialog" aria-labelledby="basicModal" aria-hidden="true">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-body">
+          <h4><%= image_tag '/assets/spinner.gif', style: "float: left; display: block; margin-left: auto; margin-right: 10px;" %> Generating network configuration. This may take a few moments.</h4>
+        </div>
+      </div>
+    </div>
+  </div>
+
 <% end %>

data/db/migrate/20141107144800_create_staypuft_deployment_vip_nics.rb

@@ -0,0 +1,15 @@
+class CreateStaypuftDeploymentVipNics < ActiveRecord::Migration
+  def change
+    create_table :staypuft_deployment_vip_nics do |t|
+      t.references :deployment, :null => false
+      t.foreign_key :staypuft_deployments, column: :deployment_id, :name => "staypuft_deployment_vip_nic_deployment_id_fk"
+
+      t.references :vip_nic, :null => false
+      t.foreign_key :nics, column: :vip_nic_id, :name => "staypuft_deployment_vip_nics_nic_id_fk"
+
+      t.timestamps
+    end
+    add_index :staypuft_deployment_vip_nics, :deployment_id
+    add_index :staypuft_deployment_vip_nics, :vip_nic_id
+  end
+end

data/lib/staypuft/engine.rb

@@ -35,8 +35,6 @@ module Staypuft
       ::Host::Discovered.send :include, Staypuft::Concerns::HostOpenStackAffiliation
       ::Host::Discovered.send :include, Staypuft::Concerns::HostDetailsHelper
       ::Puppetclass.send :include, Staypuft::Concerns::PuppetclassExtensions
-      ::Nic::Base.send :include, Staypuft::Concerns::SubnetIpManagement
-      ::Nic::Base.send :include, Staypuft::Concerns::VipNicScopes
       ::Hostgroup.send :include, Staypuft::Concerns::HostgroupExtensions
       ::Environment.send :include, Staypuft::Concerns::EnvironmentExtensions
       ::LookupKey.send :include, Staypuft::Concerns::LookupKeyExtensions

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.4.15'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.4.15
+  version: 0.5.0
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2014-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
@@ -42,28 +42,28 @@ dependencies:
   name: wicked
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -84,14 +84,14 @@ dependencies:
   name: ipaddress
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: OpenStack Foreman Installer Plugin
@@ -126,13 +126,14 @@ files:
 - app/helpers/staypuft/hosts_helper.rb
 - app/lib/actions/staypuft/deployment/deploy.rb
 - app/lib/actions/staypuft/deployment/populate.rb
-- 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/puppet_run.rb
-- app/lib/actions/staypuft/host/wait_until_host_ready.rb
-- app/lib/actions/staypuft/host/wait_until_installed.rb
-- app/lib/actions/staypuft/hostgroup/deploy.rb
+- app/lib/actions/staypuft/host/report_check.rb
+- app/lib/actions/staypuft/host/trigger_provisioning.rb
+- app/lib/actions/staypuft/host/update.rb
+- app/lib/actions/staypuft/host/wait_until_provisioned.rb
+- app/lib/actions/staypuft/host/wait_until_ready.rb
 - app/lib/actions/staypuft/hostgroup/ordered_deploy.rb
 - app/lib/actions/staypuft/middleware/as_current_user.rb
 - app/lib/staypuft/deployment_param_exporter.rb
@@ -151,8 +152,6 @@ files:
 - app/models/staypuft/concerns/lookup_key_extensions.rb
 - app/models/staypuft/concerns/nic_fencing_extensions.rb
 - app/models/staypuft/concerns/puppetclass_extensions.rb
-- app/models/staypuft/concerns/subnet_ip_management.rb
-- app/models/staypuft/concerns/vip_nic_scopes.rb
 - app/models/staypuft/deployment.rb
 - app/models/staypuft/deployment/abstract_param_scope.rb
 - app/models/staypuft/deployment/attribute_param_storage.rb
@@ -167,6 +166,7 @@ files:
 - app/models/staypuft/deployment/passwords.rb
 - app/models/staypuft/deployment/vlan_range_values_validator.rb
 - app/models/staypuft/deployment_role_hostgroup.rb
+- app/models/staypuft/deployment_vip_nic.rb
 - app/models/staypuft/fencing.rb
 - app/models/staypuft/interface_assigner.rb
 - app/models/staypuft/layout.rb
@@ -181,6 +181,7 @@ files:
 - app/models/staypuft/simple_subnet.rb
 - app/models/staypuft/subnet_type.rb
 - app/models/staypuft/subnet_typing.rb
+- app/models/staypuft/vip_nic.rb
 - app/overrides/customize_foreman_tasks_show_page.rb
 - app/overrides/foreman_hosts_edit.rb
 - app/overrides/hide_subscription_manager_passwords.rb
@@ -279,6 +280,7 @@ files:
 - db/migrate/20140831234000_add_required_to_subnet_types.rb
 - db/migrate/20141003223000_add_validation_to_subnet_types.rb
 - db/migrate/20141009064907_add_custom_repos_to_deployment.rb
+- db/migrate/20141107144800_create_staypuft_deployment_vip_nics.rb
 - db/seeds.rb
 - lib/staypuft.rb
 - lib/staypuft/engine.rb
@@ -300,24 +302,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: OpenStack Foreman Installer
 test_files:
 - test/test_helper.rb
-- test/factories/staypuft_factories.rb
+- test/staypuft_test.rb
+- test/unit/staypuft_test.rb
 - test/test_plugin_helper.rb
+- test/factories/staypuft_factories.rb
 - test/integration/navigation_test.rb
-- test/unit/staypuft_test.rb
-- test/staypuft_test.rb

data/app/lib/actions/staypuft/hostgroup/deploy.rb

@@ -1,93 +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 Hostgroup
-      class Deploy < Actions::Base
-
-        middleware.use Actions::Staypuft::Middleware::AsCurrentUser
-
-        def plan(hostgroup, hosts)
-          Type! hostgroup, ::Hostgroup
-          (Type! hosts, Array).all? { |v| Type! v, ::Host::Base }
-
-          input.update id: hostgroup.id, name: hostgroup.name
-
-          # hostgroup.hosts returns already converted hosts from Host::Discovered with build flag
-          # set to false so they are not built when assigned to the hostgroup in wizard
-          # run Hostgroup's Hosts filtered by hosts
-          host_list = hostgroup.hosts & hosts
-          orchestration_mode = hostgroup.role.orchestration unless hostgroup.role.nil?
-
-          case orchestration_mode
-          when ::Staypuft::Role::ORCHESTRATION_CONCURRENT
-            deploy_concurrently(host_list)
-          when ::Staypuft::Role::ORCHESTRATION_SERIAL
-            deploy_serially(host_list)
-          when ::Staypuft::Role::ORCHESTRATION_LEADER
-            deploy_leader_first(host_list)
-          else
-            deploy_concurrently(host_list)
-          end
-        end
-
-        def deploy_concurrently(hosts)
-          hosts.each do |host|
-            # planned in concurrence
-            plan_action Host::Deploy, host
-          end
-        end
-
-        def deploy_serially(hosts)
-          sequence do
-            hosts.each do |host|
-              plan_action Host::Deploy, host
-            end
-          end
-        end
-
-        def deploy_leader_first(hosts)
-          first_host = hosts.shift
-          sequence do
-            #deploy first host, then deploy remainder in parallel
-            plan_action Host::Deploy, first_host unless first_host.nil?
-            concurrence do
-              hosts.each do |host|
-                plan_action Host::Deploy, host
-              end
-            end
-          end
-        end
-
-        def humanized_input
-          input[:name]
-        end
-
-        def task_output
-          task_outputs = planned_actions.map(&:task_output)
-          progress     = if task_outputs.size == 0
-                           1
-                         else
-                           task_outputs.map { |to| to[:progress] }.reduce(&:+).to_f / task_outputs.size
-                         end
-          { id: input[:id], name: input[:name], progress: progress, hosts: task_outputs }
-        end
-
-        def humanized_output(task_output = self.task_output)
-          format '%s %s%%', task_output[:name], (task_output[:progress]*100).to_i
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,17 +0,0 @@
-module Staypuft
-  module Concerns
-    module SubnetIpManagement
-      extend ActiveSupport::Concern
-
-      included do
-        before_save :reserve_ip
-      end
-
-      def reserve_ip
-        if self.identifier =~ /\Avip\d+\Z/ && self.subnet.present? && self.subnet.ipam?
-          self.ip ||= self.subnet.unused_ip
-        end
-      end
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-module Staypuft
-  module Concerns
-    module VipNicScopes
-      extend ActiveSupport::Concern
-
-      included do
-        scope :vip, lambda { where(['identifier LIKE ?', 'vip%']) }
-        scope :non_vip, lambda { where(['identifier NOT LIKE ?', 'vip%']) }
-      end
-
-    end
-  end
-end