staypuft 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99a1f5f5c7b85101293d953b4593b62a0c5c88ef
-  data.tar.gz: 4191b40752bd2f7d390dfe7e91aba3b526919042
+  metadata.gz: 21289b770a15e38194b88261c2de8622344538f5
+  data.tar.gz: d53a1a5ca729733020a5da1e539cd3c46f6422e9
 SHA512:
-  metadata.gz: 99beb2ceafae6e36557f209ca737a06c999f6bca9854f3996eaa9d34846df6c4c8c7f77786fbfb66ccddf0ac2f37c0538679c8b60aba6101f304d3d29c876ebe
-  data.tar.gz: 6363d35d9dc329d997f51c230b719da0937b50a525dfa7f2be6d6ad91ce278b0089f794b9bd1c6bfee7b5d7476d5bf9ae746de931a11ba63de73445d42942ec3
+  metadata.gz: 08d0914ace7e6cfeadcc1f618bba70a765a3ff02ed933ffb5272d169a8b8e96654f333dd33dc3342742f6ac862476b7be31bd9e2e82e7543264f26b26c8766de
+  data.tar.gz: dab396f6ac46c3ca10b0f614ed42671a88a7ecef079887ee47457b96e53e2e169fb5af26236b458a7bcace11785e98268894eebb0bac0e7482da75eaad5833e7

data/app/assets/javascripts/staypuft/nics_assignment.js

@@ -0,0 +1,32 @@
+$(function() {
+  $("div.subnet-pull.active").draggable({
+    revert: 'invalid'
+  });
+
+  $("div.interface").droppable({
+    activeClass: "ui-state-default",
+    hoverClass: "ui-state-hover",
+    accept: "div.subnet-pull",
+    drop: function(event, ui) {
+      $.ajax({
+        type: 'POST',
+        url: ui.draggable.data('create-url'),
+        data: 'interface=' + $(this).data('interface'),
+        dataType: 'script'
+      });
+    }
+  });
+  $("#subnets").droppable({
+    activeClass: "ui-state-default",
+    hoverClass: "ui-state-hover",
+    accept: "div.subnet-pull.existing",
+    drop: function(event, ui) {
+      $.ajax({
+        type: 'DELETE',
+        url: ui.draggable.data('delete-url'),
+        data: 'interface=' + ui.draggable.closest('div.interface').data('interface'),
+        dataType: 'script'
+      });
+    }
+  });
+});

data/app/assets/javascripts/staypuft/staypuft.js

@@ -11,6 +11,8 @@
 // GO AFTER THE REQUIRES BELOW.
 //
 //= require_tree .
+//= require jquery.ui.draggable
+//= require jquery.ui.droppable
 
 $(function () {
   // Check all checkboxes in table
@@ -48,6 +50,22 @@ $(function () {
     $(this).siblings('.hidden_password, .shown_password').toggleClass('hide');
   });
 
+  $('#ceph_notification_dismissal').click(function(e) {
+    e.preventDefault();
+    $('.ceph_notification').toggleClass('hide');
+    var pathname = window.location.pathname
+    var id = pathname.substring(pathname.lastIndexOf('/') + 1)
+    var cephDeploymentNotification = readFromCookie();
+    cephDeploymentNotification[id] = true
+    $.cookie('ceph-deployment-notification', JSON.stringify(cephDeploymentNotification))
+  });
+  function readFromCookie() {
+    if (r = $.cookie('ceph-deployment-notification'))
+      return $.parseJSON(r);
+    else
+      return {};
+  }
+
   var duration = 150;
 
   showPasswords();
@@ -127,6 +145,18 @@ $(function () {
     }
   }
 
+  showCephNotification();
+  function showCephNotification() {
+    var cephDeploymentNotification = readFromCookie();
+    var pathname = window.location.pathname;
+    var id = pathname.substring(pathname.lastIndexOf('/') + 1);
+    if (cephDeploymentNotification !== null && cephDeploymentNotification !== undefined) {
+      if (cephDeploymentNotification[id]) {
+        $('.ceph_notification').addClass('hide');
+      }
+    }
+  }
+
   if ($('.configuration').length > 0) {
     $('.configuration').find('li').first().find('a')[0].click();
   }
@@ -186,6 +216,13 @@ $(function () {
     $(window).scrollTop( 0 );
   }
 
+  $('.dynamic-submit').click(function() {
+    this.form.action = $(this).data('submit-to');
+    this.form.method = $(this).data('method');
+    this.form.submit();
+    return false;
+  })
+
   var free_host_checkboxes = $('#free-hosts table input:checkbox');
   free_host_checkboxes.click(function(){
     $("#assign_hosts_modal").attr("disabled", !free_host_checkboxes.is(":checked"));
@@ -194,6 +231,7 @@ $(function () {
   var assigned_host_checkboxes = $('#assigned-hosts table input:checkbox');
   assigned_host_checkboxes.click(function(){
     $("#unassign_hosts_button").attr("disabled", !assigned_host_checkboxes.is(":checked"));
+    $("#configure_networks_button").attr("disabled", !assigned_host_checkboxes.is(":checked"));
   });
 
   var deployed_host_checkboxes = $('#deployed-hosts table input:checkbox');

data/app/assets/javascripts/staypuft/subnets_assignment.js

@@ -0,0 +1,40 @@
+$(function() {
+  $("div.subnet-type-pull").draggable({
+    revert: 'invalid'
+  });
+
+  $("div.subnet-drop-zone").droppable({
+    activeClass: "ui-state-default",
+    hoverClass: "ui-state-hover",
+    accept: "div.subnet-type-pull",
+    drop: function(event, ui) {
+      if(ui.draggable.hasClass('new')) {
+        $.ajax({
+          type: 'POST',
+          url: ui.draggable.data('create-url'),
+          data: 'subnet_type_id=' + ui.draggable.data('subnet-type-id') + '&subnet_id=' + $(this).data('subnet-id'),
+          dataType: 'script'
+        })
+      } else {
+        $.ajax({
+          type: 'PUT',
+          url: ui.draggable.data('update-url'),
+          data: 'subnet_id=' + $(this).data('subnet-id'),
+          dataType: 'script'
+        })
+      }
+    }
+  });
+  $("#subnet_types").droppable({
+    activeClass: "ui-state-default",
+    hoverClass: "ui-state-hover",
+    accept: "div.subnet-type-pull.existing",
+    drop: function(event, ui) {
+      $.ajax({
+        type: 'DELETE',
+        url: ui.draggable.data('delete-url'),
+        dataType: 'script'
+      });
+    }
+  });
+});

data/app/assets/stylesheets/staypuft/bootstrap_and_overrides.css.scss

@@ -46,6 +46,10 @@
   padding: 19px 36px;
   background-color: #f5f5f5;
   @include center-block;
+
+  table tbody td {
+    background-color: #fff;
+  }
 }
 
 .tabbed_side_nav_form{
@@ -80,7 +84,7 @@
 }
 
 .wizard {
-  width: 675px;
+  width: 900px;
   display: block;
   @include center-block;
 }

data/app/assets/stylesheets/staypuft/staypuft.css.scss

@@ -101,6 +101,18 @@ span.editable, span.editable:hover {
   overflow: auto;
 }
 
+
+.nav > li > a.roles_list {
+  padding: 0;
+  border: 1px solid #ddd;
+  & > div {
+    padding: 10px;
+    &:not(:first-child) {
+      border-left: 1px solid #ddd;
+    }
+  }
+}
+
 .association.well {
   min-height: 500px;
   margin-top: 50px;
@@ -111,3 +123,93 @@ span.editable, span.editable:hover {
     }
   }
 }
+
+$pull_line_height: 40px;
+.subnet-type-pull, .empty-zone {
+  height: $pull_line_height;
+  line-height: $pull_line_height;
+}
+
+.subnet-type-pull, .subnet-pull, .empty-zone {
+  float: left;
+  min-width: 100px;
+  text-align: center;
+  margin-left: 10px;
+  background-color: #f5f5f5;
+  border-color: #000;
+  border-width: 1px;
+}
+
+.subnet-type-pull, .subnet-pull {
+  z-index: 1;
+  border-style: solid;
+  background-color: #ffffff;
+}
+
+.subnet-type-pull, .subnet-pull.active {
+  cursor: pointer;
+  background-color: #f5f5f5;
+}
+
+.subnet-pull {
+  height: $pull_line_height;
+  display: table;
+  padding-left: 5px;
+  padding-right: 5px;
+  margin-top: 10px;
+
+  .name {
+    font-weight: bold;
+  }
+
+  .content {
+    display: table-cell;
+    vertical-align: middle;
+  }
+}
+
+.subnet-pull.virtual {
+  background-color: #d7f5f5;
+}
+
+div.cleared {
+  clear: left;
+}
+
+.empty-zone {
+  border-style: dashed;
+}
+
+.subnet-drop-zone {
+  border: 1px solid black;
+  height: 90px;
+  margin-bottom: 10px;
+
+  .name {
+    margin-left: 5px;
+    margin-top: 5px;
+    margin-bottom: 10px;
+    font-weight: bold;
+  }
+}
+
+div.interface {
+  margin-bottom: 10px;
+
+  div.identifier {
+    float: left;
+    width: 70px;
+    border: 1px solid #000;
+    height: $pull_line_height + 20px;
+    line-height: $pull_line_height + 20px;
+    text-align: center;
+    font-weight: bold;
+  }
+
+  div.subnet-drop-zones {
+    border: 1px solid #000;
+    padding-top: 10px;
+    width: 100%;
+    height: $pull_line_height + 20px;
+  }
+}

data/app/controllers/staypuft/deployments_controller.rb

@@ -190,6 +190,11 @@ module Staypuft
       # root_pass is not copied for some reason
       host.root_pass   = hostgroup.root_pass
 
+      # clear all virtual devices that may have been created during previous assignment
+      host.clean_vlan_interfaces
+      # by default foreman will try to manage all NICs unless user disables manually after assignment
+      host.make_all_interfaces_managed
+
       # 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.

data/app/controllers/staypuft/interface_assignments_controller.rb

@@ -0,0 +1,76 @@
+module Staypuft
+  class InterfaceAssignmentsController < Staypuft::ApplicationController
+    def index
+      @deployment = Deployment.find(params[:deployment_id])
+      @hosts = Host::Managed.where(:id => params[:host_ids]).includes(:interfaces)
+      @subnets = @deployment.subnets.uniq
+      @host = @hosts.first
+      @interfaces = @host ? @host.interfaces.where("type <> 'Nic::BMC'").order(:identifier).physical : []
+
+      errors = {}
+      @hosts.each do |host|
+        host_errors = compare(host, @host)
+        errors[host.name] = host_errors.join(' and ') if host_errors.present?
+      end
+
+      if errors.present?
+        flash[:error] = errors.map{ |k, v| "#{k}: #{v}" }.join('<br />')
+        redirect_to deployment_path(@deployment)
+      end
+    end
+
+    def create
+      @errors = {}
+      @deployment = Deployment.find(params[:deployment_id])
+      @hosts = Host::Managed.where(:id => params[:host_ids])
+      @hosts.each do |host|
+        @interface = host.interfaces.find_by_identifier(params[:interface]) || host
+        @subnet = Subnet.find(params[:subnet_id])
+        @assigner = InterfaceAssigner.new(@deployment, @interface, @subnet)
+        @assigner.assign
+        @errors[host.name] = @assigner.errors if @assigner.errors.present?
+      end
+      @saved = @errors.blank?
+    end
+
+    def destroy
+      @errors = {}
+      @deployment = Deployment.find(params[:deployment_id])
+      @hosts = Host::Managed.where(:id => params[:host_ids])
+      @hosts.each do |host|
+        @interface = host.interfaces.find_by_identifier(params[:interface]) || host
+        @subnet = Subnet.find(params[:subnet_id])
+        @assigner = InterfaceAssigner.new(@deployment, @interface, @subnet)
+        @assigner.unassign
+        @errors[host.name] = @assigner.errors if @assigner.errors.present?
+      end
+      @destroyed = @errors.blank?
+    end
+
+    private
+
+    def compare(comparing, original)
+      errors = []
+      # primary interfaces, we don't check subnet_id since it's always PXE subnet
+      if comparing.primary_interface != original.primary_interface
+        errors.push _('does not have interfaces with same names')
+        return errors
+      end
+
+      # other interfaces
+      comparing = get_interfaces_to_compare(comparing)
+      original = get_interfaces_to_compare(original)
+      errors.push _('does not have same amount of interfaces') and return errors if comparing.size != original.size
+      comparing.each do |interface|
+        original_interface = original.select { |i| i.identifier == interface.identifier }.first
+        errors.push _('does not have interfaces with same names') and return errors if original_interface.nil?
+        errors.push _('has different subnet assignment on interface %s') % interface.identifier if interface.subnet_id != original_interface.subnet_id
+      end
+      errors
+    end
+
+    def get_interfaces_to_compare(host)
+      host.interfaces.where("type <> 'Nic::BMC'").order(:identifier)
+    end
+  end
+end

data/app/controllers/staypuft/steps_controller.rb

@@ -1,7 +1,7 @@
 module Staypuft
   class StepsController < Staypuft::ApplicationController
     include Wicked::Wizard
-    steps :deployment_settings, :services_overview, :services_configuration
+    steps :deployment_settings, :network_configuration, :services_overview, :services_configuration
 
     before_filter :get_deployment
 
@@ -13,6 +13,8 @@ module Staypuft
         if !@deployment.ha? && @deployment.cinder.lvm_ptable.nil?
           flash[:warning] = "Missing Partition Table 'LVM with cinder-volumes', LVM cinder backend won't work." 
         end
+      when :network_configuration
+        @subnets = Subnet.search_for(params[:search], :order => params[:order]).includes(:domains, :dhcp).paginate :page => params[:page]
       when :services_configuration
         @services_map = [:nova, :neutron, :glance, :cinder]
       end
@@ -30,6 +32,15 @@ module Staypuft
         @deployment.passwords.attributes = params[:staypuft_deployment].delete(:passwords)
         @deployment.attributes = params[:staypuft_deployment]
 
+        # we don't care too much whether pxe network was detected or all typings were saved since it's
+        # just a helper for user to have all types preassigned to pxe network
+        pxe_network = Subnet.where('dhcp_id IS NOT NULL').first
+        if pxe_network
+          @deployment.unassigned_subnet_types.each do |type|
+            @deployment.subnet_typings.new(:subnet_id => pxe_network.id, :subnet_type_id => type.id).save
+          end
+        end
+
       when :services_overview
         @deployment.form_step = Deployment::STEP_OVERVIEW
 
@@ -41,6 +52,9 @@ module Staypuft
             @deployment.send(service).attributes = params[:staypuft_deployment].delete(service)
           end
         end
+      when :network_configuration
+        @deployment.form_step = Deployment::STEP_NETWORKING
+        @subnets = Subnet.search_for(params[:search], :order => params[:order]).includes(:domains, :dhcp).paginate :page => params[:page]
       else
         raise 'unknown step'
       end

data/app/controllers/staypuft/subnet_typings_controller.rb

@@ -0,0 +1,42 @@
+module Staypuft
+  class SubnetTypingsController < ActionController::Base
+    def create
+      @deployment = Deployment.find(params[:deployment_id])
+      @subnet_type = SubnetType.find(params[:subnet_type_id])
+      @subnet = Subnet.find(params[:subnet_id])
+      check_for_existing_assignments
+      @subnet_typing = @deployment.subnet_typings.new(:subnet_id => @subnet.id, :subnet_type_id => @subnet_type.id)
+      @saved = @subnet_typing.save
+    end
+
+    def update
+      @subnet_typing = SubnetTyping.find(params[:id])
+      @deployment = @subnet_typing.deployment
+      @subnet_type = @subnet_typing.subnet_type
+      @subnet = Subnet.find(params[:subnet_id])
+      check_for_existing_assignments
+      @subnet_typing.subnet = @subnet
+      @saved = @subnet_typing.save
+    end
+
+    def destroy
+      @subnet_typing = SubnetTyping.find(params[:id])
+      @deployment = @subnet_typing.deployment
+      @subnet = @subnet_typing.subnet
+      check_for_existing_assignments
+      @subnet_type = @subnet_typing.subnet_type
+      @destroyed = @subnet_typing.destroy
+    end
+
+    private
+
+    def check_for_existing_assignments
+      existing = @deployment.hosts.includes(:interfaces).any? do |h|
+        h.subnet_id == @subnet.id || h.interfaces.any? { |i| i.subnet_id == @subnet.id }
+      end
+      if existing
+        @warn = _('Some hosts interfaces were already assigned to this subnet, check interface assignment before deploying!')
+      end
+    end
+  end
+end

data/app/helpers/staypuft/deployments_helper.rb

@@ -4,6 +4,7 @@ module Staypuft
       wizard_header(
           step,
           _("Deployment Settings"),
+          _("Network Configuration"),
           _("Services Overview"),
           _("Services Configuration")
       )
@@ -33,9 +34,7 @@ module Staypuft
         style           ="label-default"
         short           = s_("Discovered|D")
         label           = _('Discovered Host')
-        # TODO remove after migrating to foreman_discover 1.3.0
-        hash_for_method = [:hash_for_discovered_host_path, :hash_for_discover_path].find { |m| respond_to? m }
-        path            = send hash_for_method, host
+        path            = hash_for_discovered_host_path(host)
       else
         style = 'label-warning'
         short = s_("Error|E")
@@ -48,6 +47,22 @@ module Staypuft
                     :class                 => "label label-light " + style,
                     :"data-original-title" => _(label) }) + link_to(trunc("  #{host}", 32), path)
     end
+
+    def host_nics(host)
+      host.interfaces_identifiers.compact.sort.join(tag(:br)).html_safe
+    end
+
+    def is_pxe?(deployment, subnet)
+      subnet_typings(deployment, subnet).any? { |t| t.subnet_type.name == Staypuft::SubnetType::PXE }
+    end
+
+    def subnet_types(deployment, subnet)
+      subnet_typings(deployment, subnet).map { |t| h(t.subnet_type.name) }.join(' + ')
+    end
+
+    def subnet_typings(deployment, subnet)
+      deployment.subnet_typings.where(:subnet_id => subnet.id).includes(:subnet_type)
+    end
   end
 
 end

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

@@ -26,12 +26,49 @@ module Actions
           # 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
-          (hostgroup.hosts & hosts).each do |host|
+          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

data/app/lib/staypuft/network_query.rb

@@ -0,0 +1,35 @@
+module Staypuft
+  class NetworkQuery
+
+    def initialize(deployment)
+      @deployment = deployment
+    end
+
+    private
+    def interface_hash_for_host(host, subnet_type_name)
+      subnet_type = @deployment.layout.subnet_types.where(:name=> subnet_type_name).first
+
+      # raise error if no subnet with this name is assigned to this layout
+      if subnet_type.nil?
+        raise ArgumentError, "Invalid subnet type  '#{subnet_type_name}' for layout of this deployment #{@deployment.name}"
+      end
+
+      subnet_typing = @deployment.subnet_typings.where(:subnet_type_id => subnet_type.id).first
+      # if this subnet type isn't assigned to a subnet for this deployment, return nil
+      return nil if subnet_typing.nil?
+      subnet = subnet_typing.subnet
+
+      secondary_iface = host.interfaces.where(:subnet_id => subnet.id).first
+      # check for primary interface
+      if (host.subnet_id == subnet.id)
+        {:subnet => host.subnet, :ip => host.ip,
+         :interface => host.primary_interface, :mac =>  host.mac }
+      elsif !iface.nil?
+        {:subnet => secondary_iface.subnet, :ip => secondary_iface.ip,
+         :interface => secondary_iface.name, :mac =>  secondary_iface.mac }
+      else
+        nil
+      end
+    end
+  end
+end