staypuft 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21289b770a15e38194b88261c2de8622344538f5
-  data.tar.gz: d53a1a5ca729733020a5da1e539cd3c46f6422e9
+  metadata.gz: ffc4713af541fbd45de1031951ef127af36cc43d
+  data.tar.gz: 74e411dad81c3260b1d636be7728443c7488863a
 SHA512:
-  metadata.gz: 08d0914ace7e6cfeadcc1f618bba70a765a3ff02ed933ffb5272d169a8b8e96654f333dd33dc3342742f6ac862476b7be31bd9e2e82e7543264f26b26c8766de
-  data.tar.gz: dab396f6ac46c3ca10b0f614ed42671a88a7ecef079887ee47457b96e53e2e169fb5af26236b458a7bcace11785e98268894eebb0bac0e7482da75eaad5833e7
+  metadata.gz: 25789e7b3464ad1bdb69777ff80f23f9c5723d33e2c26f544f661f5c00eadd6bba7a3fd65dda4a7a8f25aa060792839fccd30eaee5b8867d5d994d78a28c0c1d
+  data.tar.gz: 227301210b654338dc414554bc5b32684ca0719052261003227f05f06e0ec75f850a975ce1702710f844b558f184a11470d61f01234ca708306a3c6977e2e8e2

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

@@ -1,11 +1,11 @@
-$(function() {
+var nics_assignment = (function() {
   $("div.subnet-pull.active").draggable({
     revert: 'invalid'
   });
 
   $("div.interface").droppable({
-    activeClass: "ui-state-default",
-    hoverClass: "ui-state-hover",
+    activeClass: "panel-droppable",
+    hoverClass: "panel-success",
     accept: "div.subnet-pull",
     drop: function(event, ui) {
       $.ajax({
@@ -17,8 +17,8 @@ $(function() {
     }
   });
   $("#subnets").droppable({
-    activeClass: "ui-state-default",
-    hoverClass: "ui-state-hover",
+    activeClass: "panel-droppable",
+    hoverClass: "panel-success",
     accept: "div.subnet-pull.existing",
     drop: function(event, ui) {
       $.ajax({

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

@@ -124,9 +124,9 @@ $(function () {
   }
 
   showCinderNfsUri();
-  $("input[name='staypuft_deployment[cinder][driver_backend]']").change(showCinderNfsUri);
+  $("#staypuft_deployment_cinder_backend_nfs").change(showCinderNfsUri);
   function showCinderNfsUri() {
-    if ($('#staypuft_deployment_cinder_driver_backend_nfs').is(":checked")) {
+    if ($('#staypuft_deployment_cinder_backend_nfs').is(":checked")) {
       $('.cinder_nfs_uri').show();
     }
     else {
@@ -135,10 +135,13 @@ $(function () {
   }
 
   showCinderEquallogic();
-  $("input[name='staypuft_deployment[cinder][driver_backend]']").change(showCinderEquallogic);
+  $("#staypuft_deployment_cinder_backend_eqlx").change(showCinderEquallogic);
   function showCinderEquallogic() {
-    if ($('#staypuft_deployment_cinder_driver_backend_equallogic').is(":checked")) {
+    if ($('#staypuft_deployment_cinder_backend_eqlx').is(":checked")) {
       $('.cinder_equallogic').show();
+      if($('#eqlxs').children().length == 0) {
+        $('.add_another_server').click();
+      }
     }
     else {
       $('.cinder_equallogic').hide();
@@ -206,6 +209,33 @@ $(function () {
     window.location.hash = "#hosts";
   });
 
+  $('#configure_networks_modal').on('shown.bs.modal', function(e) {
+    var height = $(window).height() - 200;
+    $(this).find(".modal-body").css("max-height", height);
+    var to_assign = $("input:checkbox[name=host_ids[]]:checked").map(
+      function() {
+        return $(this).attr('value');
+      }).get().join();
+    /* remove the first if it's the select all */
+    if(to_assign.substr(0,2) == 'on') {
+      to_assign = to_assign.substr(3);
+    }
+    var to_path = $('#configure_networks_modal').data('path');
+    $.ajax({
+        url: to_path,
+        type: "GET",
+        //Pass in each variable as a parameter.
+        data: {
+          host_ids: to_assign
+        },
+        success: function(data){
+          $('#interfaces').html(data).promise().done(function(){
+            nics_assignment();
+          });
+        }
+    });
+  });
+
   var scrolled = false;
 
   $(window).scroll(function(){
@@ -248,5 +278,28 @@ $(function () {
       }).show();
   });
 
-  $('.inner-nav').click(function(){ hosts_filter.val("").keyup(); }); 
+  /* clear filter if switching */
+  $('.inner-nav').click(function(){ hosts_filter.val("").keyup(); });
+
+// add more highlighting for tabs with errors
+  $(".tab-content").find(".form-group.has-error").each(function(index) {
+    var id = $(this).parentsUntil(".tab-content").last().attr("id");
+    $("a[href=#"+id+"]").parent().addClass("tab-error");
+  })
+
+  $("button.add_another_server").live("click", function() {
+    var eqlx_form = function () {
+      return $('#eqlx_form_template').text().replace(/NEW_RECORD/g, new Date().getTime());
+    }
+    $('#eqlxs').append(eqlx_form());
+    if($('#eqlxs').children().length > 1) {
+      var added_form_span = $('#eqlxs').children().last().find('h5').find('.server_number');
+      var previous_span_number = $('#eqlxs').children().eq(-2).find('h5').find('.server_number');
+      added_form_span.html(parseInt(previous_span_number.html(), 10) + 1);
+    }
+  })
+
+  $(".eqlx h5 a.remove").live("click", function(){
+      $(this).parent().parent().remove();
+  });
 });

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

@@ -4,8 +4,8 @@ $(function() {
   });
 
   $("div.subnet-drop-zone").droppable({
-    activeClass: "ui-state-default",
-    hoverClass: "ui-state-hover",
+    activeClass: "panel-droppable",
+    hoverClass: "panel-success",
     accept: "div.subnet-type-pull",
     drop: function(event, ui) {
       if(ui.draggable.hasClass('new')) {
@@ -26,8 +26,9 @@ $(function() {
     }
   });
   $("#subnet_types").droppable({
-    activeClass: "ui-state-default",
-    hoverClass: "ui-state-hover",
+    activeClass: "panel-droppable",
+    hoverClass: "panel-success",
+    accept: "div.subnet-type-pull",
     accept: "div.subnet-type-pull.existing",
     drop: function(event, ui) {
       $.ajax({

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

@@ -74,6 +74,22 @@
         -webkit-transform:rotate(360deg);
       }
     }
+
+    & > li.tab-error > a.tab-error span {
+      visibility: visible !important;
+      padding-left: 6px;
+    }
+
+    & > li.tab-error.active {
+      a {
+        background-color: $state-danger-text;
+        color: white !important;
+      }
+
+      a:after {
+        border-color: transparent transparent transparent $state-danger-text;
+      }
+    }
   }
   .tab-content {
     min-height: 520px;

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

@@ -124,92 +124,51 @@ span.editable, span.editable:hover {
   }
 }
 
-$pull_line_height: 40px;
-.subnet-type-pull, .empty-zone {
-  height: $pull_line_height;
-  line-height: $pull_line_height;
-}
-
+// subnet and nics drag 'n drop association
 .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;
+  @extend .btn;
+  @extend .btn-default;
+  background: $well-bg;
+  margin: 3px 0;
+  &:active, &.active {
+    box-shadow: none;
+    z-index: 1;
+  }
 }
 
 .subnet-pull {
-  height: $pull_line_height;
-  display: table;
-  padding-left: 5px;
-  padding-right: 5px;
-  margin-top: 10px;
-
-  .name {
-    font-weight: bold;
+  text-align: left;
+  .virtual {
+    background-color: #d7f5f5;
   }
-
-  .content {
-    display: table-cell;
-    vertical-align: middle;
-  }
-}
-
-.subnet-pull.virtual {
-  background-color: #d7f5f5;
-}
-
-div.cleared {
-  clear: left;
 }
 
 .empty-zone {
   border-style: dashed;
+  background: transparent;
+  min-width: 100px;
+  &:hover, &:active {
+    background: transparent;
+    box-shadow: none;
+  }
 }
 
-.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;
+.subnet-drop-zone.panel-droppable,
+#subnet_types.panel-droppable,
+.interface.panel-droppable,
+#subnets.panel-droppable {
+  border: 1px solid $panel-success-text;
+  .empty-zone {
+    border: 1px dashed $panel-success-text;
   }
 }
 
-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;
+#configure_networks_modal {
+  .modal-dialog {
+    width: 90%;
   }
 
-  div.subnet-drop-zones {
-    border: 1px solid #000;
-    padding-top: 10px;
-    width: 100%;
-    height: $pull_line_height + 20px;
+  .modal-body{
+    overflow-y: auto;
   }
 }

data/app/controllers/staypuft/deployments_controller.rb

@@ -115,14 +115,26 @@ module Staypuft
 
       hosts_to_unassign = ::Host::Base.find Array(params[:host_ids])
 
+      removed_vips_hostgroup = nil
       hosts_to_unassign.each do |host|
         unless host.open_stack_deployed? && deployment_in_progress
+          vip_interfaces = host.interfaces.vip
+          removed_vips_hostgroup = host.hostgroup unless vip_interfaces.empty?
+          vip_interfaces.each(&:destroy)
           host.open_stack_unassign
           host.environment = Environment.get_discovery
           host.save!
           host.setBuild
         end
       end
+      if removed_vips_hostgroup
+        removed_vips_hostgroup.reload
+        newhost = removed_vips_hostgroup.hosts.first
+        unless newhost.nil?
+          build_vips_if_needed(newhost)
+          newhost.save!
+        end
+      end
 
       redirect_to deployment_path(deployment)
     end
@@ -195,6 +207,9 @@ module Staypuft
       # by default foreman will try to manage all NICs unless user disables manually after assignment
       host.make_all_interfaces_managed
 
+      # we create VIPs interfaces if this is the first host in Controller HA hostgroup
+      build_vips_if_needed(host)
+
       # 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.
@@ -207,6 +222,14 @@ module Staypuft
         discovered_host.becomes(Host::Base).update_column(:type, original_type) unless saved
       end
     end
+
+    def build_vips_if_needed(host)
+      hostgroup = host.hostgroup
+      hostgroup.reload if hostgroup
+      if hostgroup && hostgroup.deployment.ha? && (hostgroup == hostgroup.deployment.controller_hostgroup) && hostgroup.hosts.all? { |h| h.interfaces.vip.empty? }
+        host.build_vips(Staypuft::NetworkQuery::VIP_NAMES)
+      end
+    end
   end
 
 end

data/app/controllers/staypuft/interface_assignments_controller.rb

@@ -1,11 +1,12 @@
 module Staypuft
   class InterfaceAssignmentsController < Staypuft::ApplicationController
+    layout false
     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 : []
+      @interfaces = @host ? @host.interfaces.where("type <> 'Nic::BMC'").non_vip.order(:identifier).physical : []
 
       errors = {}
       @hosts.each do |host|

data/app/lib/staypuft/network_query.rb

@@ -1,12 +1,95 @@
 module Staypuft
   class NetworkQuery
 
+    VIP_NAMES = {
+      :ceilometer_admin_vip   => Staypuft::SubnetType::ADMIN_API,
+      :ceilometer_private_vip => Staypuft::SubnetType::MANAGEMENT,
+      :ceilometer_public_vip  => Staypuft::SubnetType::PUBLIC_API,
+      :cinder_admin_vip       => Staypuft::SubnetType::ADMIN_API,
+      :cinder_private_vip     => Staypuft::SubnetType::MANAGEMENT,
+      :cinder_public_vip      => Staypuft::SubnetType::PUBLIC_API,
+      :db_vip                 => Staypuft::SubnetType::MANAGEMENT,
+      :glance_admin_vip       => Staypuft::SubnetType::ADMIN_API,
+      :glance_private_vip     => Staypuft::SubnetType::MANAGEMENT,
+      :glance_public_vip      => Staypuft::SubnetType::PUBLIC_API,
+      :heat_admin_vip         => Staypuft::SubnetType::ADMIN_API,
+      :heat_private_vip       => Staypuft::SubnetType::MANAGEMENT,
+      :heat_public_vip        => Staypuft::SubnetType::PUBLIC_API,
+      :heat_cfn_admin_vip     => Staypuft::SubnetType::ADMIN_API,
+      :heat_cfn_private_vip   => Staypuft::SubnetType::MANAGEMENT,
+      :heat_cfn_public_vip    => Staypuft::SubnetType::PUBLIC_API,
+      :horizon_admin_vip      => Staypuft::SubnetType::ADMIN_API,
+      :horizon_private_vip    => Staypuft::SubnetType::MANAGEMENT,
+      :horizon_public_vip     => Staypuft::SubnetType::PUBLIC_API,
+      :keystone_admin_vip     => Staypuft::SubnetType::ADMIN_API,
+      :keystone_private_vip   => Staypuft::SubnetType::MANAGEMENT,
+      :keystone_public_vip    => Staypuft::SubnetType::PUBLIC_API,
+      :loadbalancer_vip       => Staypuft::SubnetType::PUBLIC_API,
+      :neutron_admin_vip      => Staypuft::SubnetType::ADMIN_API,
+      :neutron_private_vip    => Staypuft::SubnetType::MANAGEMENT,
+      :neutron_public_vip     => Staypuft::SubnetType::PUBLIC_API,
+      :nova_admin_vip         => Staypuft::SubnetType::ADMIN_API,
+      :nova_private_vip       => Staypuft::SubnetType::MANAGEMENT,
+      :nova_public_vip        => Staypuft::SubnetType::PUBLIC_API,
+      :amqp_vip               => Staypuft::SubnetType::MANAGEMENT,
+      :swift_public_vip       => Staypuft::SubnetType::PUBLIC_API,
+      :keystone_private_vip   => Staypuft::SubnetType::MANAGEMENT
+    }
+    COUNT     = VIP_NAMES.size
+
     def initialize(deployment)
       @deployment = deployment
     end
 
+    def ip_for_host(host, subnet_type_name)
+      interface_hash_for_host(host, subnet_type_name)[:ip]
+    end
+
+    def interface_for_host(host, subnet_type_name)
+      interface_hash_for_host(host, subnet_type_name)[:interface]
+    end
+
+    def controllers
+      @controllers ||= @deployment.controller_hostgroup.hosts.order(:id)
+    end
+
+    def controller_ips(subnet_type_name)
+      controllers.map { |controller| ip_for_host(controller, subnet_type_name) }
+    end
+
+    def controller_ip(subnet_type_name)
+      ip_for_host(controllers.tap { |v| v.size == 1 or raise }.first, subnet_type_name)
+    end
+
+    def controller_fqdns
+      controllers.map &:fqdn
+    end
+
+    def vip_controller
+      controllers.each do |controller|
+        return controller unless controller.interfaces.vip.empty?
+      end
+      return nil
+    end
+
+    def get_vip(vip_name)
+      if VIP_NAMES[vip_name]
+        controller = vip_controller
+        interface = controller.interfaces.vip.where(:tag => vip_name).first if controller
+        interface.ip if interface
+      end
+    end
+
+    class Jail < Safemode::Jail
+      allow :ip_for_host, :interface_for_host, :controller_ip, :controller_ips, :controller_fqdns, :get_vip
+    end
+
     private
     def interface_hash_for_host(host, subnet_type_name)
+      if host.nil?
+        raise ArgumentError, "no host specified"
+      end
+
       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
@@ -16,19 +99,19 @@ module Staypuft
 
       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?
+      return {} if subnet_typing.nil?
       subnet = subnet_typing.subnet
 
-      secondary_iface = host.interfaces.where(:subnet_id => subnet.id).first
+      secondary_iface = host.interfaces.non_vip.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?
+      elsif !secondary_iface.nil?
         {:subnet => secondary_iface.subnet, :ip => secondary_iface.ip,
-         :interface => secondary_iface.name, :mac =>  secondary_iface.mac }
+         :interface => secondary_iface.identifier, :mac =>  secondary_iface.mac }
       else
-        nil
+        {}
       end
     end
   end