staypuft 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecedbdd2ea81a9ce7287d7cdbe5382f8ce86e5a3
-  data.tar.gz: cb2332dab9ceda616c083f1a2196f13c3a7cf10f
+  metadata.gz: 17db35905779581497986043c56782829969ded1
+  data.tar.gz: 8110916cfe794b3531fd11532e4ff800882aafce
 SHA512:
-  metadata.gz: 9418075d837ba35a8be9a79a02e9aa5e5e64a4ed0b8f8c89c7ded7e47f4a61dca4a5c0ced030e14c75fa1cb63758de6ea114f97c86e661647cdc881ca42e933e
-  data.tar.gz: f5d1961cfb88f300bd0c932112125a755a7b769f3a0e7911ad0e648b0c5c692bc1cff71a7b80b6bc937df3a0de732481b86dcc51f37b26dfb17463cb754c2c32
+  metadata.gz: 29f22381981d26709e8c81bbd7505947a4951d48a5508690ef7261bf47afc2662cac7f838b76d140a3fa8980fb9cc605ca73c6204181bc1636e06f4e2777814c
+  data.tar.gz: ed56ecce9c8713e1a30199c379b96984894c6a15b95ed8d6e036fbf74078d6729d3752bd87164c14bea2f50577154df6bc924faac10011b49456bb04273a6bc8

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

@@ -1,141 +1,97 @@
-function find_network_interface_field(fieldset, field, html_input_type) {
-  label = fieldset.find("label[for='" + field + "']");
-  html_input = label.parent().find(html_input_type);
+$(function() {
+  function find_network_interface_field(fieldset, field, html_input_type) {
+    label = fieldset.find("label[for='" + field + "']");
+    html_input = label.parent().find(html_input_type);
 
-  return html_input;
-};
+    return html_input;
+  }
 
 
-$(document).ready(function() {
-  update_fencing_form();
-  // NOTE: setTimeout is required to make sure this code runs after all event
-  //       handlers are set, so they can be overridden.
-  setTimeout(function() {
-    override_ajax_submit();
-  }, 1);
-});
-
-function override_ajax_submit() {
-  // NOTE: method defined in app/assets/javascripts/host_edit.js but modified
-  //       so the URL points to staypuft/hosts controller.
-  function submit_host(){
-    var url = window.location.pathname.replace(/\/edit$|\/new$/,'');
-    url = url.replace(/\/hosts/,'\/staypuft/hosts')
-    if(/\/clone$/.test(window.location.pathname)){ url = foreman_url('/staypuft/hosts'); }
-    $('#host_submit').attr('disabled', true);
-    stop_pooling = false;
-    $("body").css("cursor", "progress");
-    clear_errors();
-    animate_progress();
-
-    $.ajax({
-      type:'POST',
-      url: url,
-      data: $('form').serialize(),
-      success: function(response){
-        if(response.redirect){
-          window.location.replace(response.redirect);
-        }
-        else{
-          $("#host-progress").hide();
-          $('#content').replaceWith($("#content", response));
-          $(document.body).trigger('ContentLoad');
-          if($("[data-history-url]").exists()){
-              history.pushState({}, "Host show", $("[data-history-url]").data('history-url'));
-          }
-        }
-      },
-      error: function(response){
-        $('#content').html(response.responseText);
-      },
-      complete: function(){
-        stop_pooling = true;
-        $("body").css("cursor", "auto");
-        $('#host_submit').attr('disabled', false);
-      }
+  function get_bmc_interface_form() {
+    return $('fieldset#interface').filter(function(index, fieldset){
+      type = find_network_interface_field($(fieldset), 'type', 'select');
+      return type.val() == 'Nic::BMC';
     });
-    return false;
   }
 
-  $(document).off('submit').on('submit',"[data-submit='progress_bar']", function() {
-    submit_host();
-    return false;
-  });
-};
+  update_fencing_form();
+  $(document).on('change', 'fieldset#interface', function() { update_fencing_form(); });
+  function update_fencing_form() {
+    bmc_fieldset = get_bmc_interface_form();
+    if (bmc_fieldset.length == 0) {
+      disable_fencing_form();
+      return;
+    } else {
+      enable_fencing_form();
+    }
+
+    selected_provider = find_network_interface_field(bmc_fieldset, 'provider', 'select');
+
+    ip = find_network_interface_field(bmc_fieldset, 'ip', 'input').val();
+    $('#host_fencing_fence_ipmilan_address').val(ip);
+    username = find_network_interface_field(bmc_fieldset, 'username', 'input').val();
+    $('#host_fencing_fence_ipmilan_username').val(username);
+    password = find_network_interface_field(bmc_fieldset, 'password', 'input').val();
+    $('#host_fencing_fence_ipmilan_password').val(password);
+  }
 
+  $(document).on('click', 'fieldset#interface a.remove_nested_fields', function() { check_existence_of_bmc_interface(); });
+  function check_existence_of_bmc_interface() {
+    visible_bmc_forms = $.grep(get_bmc_interface_form(), function(fieldset) {
+      // NOTE: The second part of the condition is necessary because Foreman
+      //       inserts the form to the DOM tree incorrectly after the second
+      //       time
+      return $(fieldset).parent().is(':visible') && $(fieldset).find(':first').is(':visible');
+    });
 
-$(document).on('change', 'fieldset#interface', function() { update_fencing_form(); });
-function update_fencing_form() {
-  bmc_fieldset = get_bmc_interface_form();
-  if (bmc_fieldset.length == 0) {
-    disable_fencing_form();
-    return;
-  } else {
-    enable_fencing_form();
+    if(visible_bmc_forms.length == 0) {
+      disable_fencing_form();
+    }
   }
 
-  selected_provider = find_network_interface_field(bmc_fieldset, 'provider', 'select');
-
-  ip = find_network_interface_field(bmc_fieldset, 'ip', 'input').val();
-  $('#host_fencing_attrs_fence_ipmilan_address').val(ip);
-  username = find_network_interface_field(bmc_fieldset, 'username', 'input').val();
-  $('#host_fencing_attrs_fence_ipmilan_username').val(username);
-  password = find_network_interface_field(bmc_fieldset, 'password', 'input').val();
-  $('#host_fencing_attrs_fence_ipmilan_password').val(password);
-};
-
-function disable_fencing_form() {
-  $('#fencing_form').hide();
-  $('#fencing_disabled_notice').show();
-};
-
-function enable_fencing_form() {
-  $('#fencing_disabled_notice').hide();
-  $('#fencing_form').show();
-};
-
-
-$(document).on('change', '#fencing', function() { update_bmc_interface_form(); });
-function update_bmc_interface_form() {
-  bmc_fieldset = get_bmc_interface_form();
-  selected_provider = find_network_interface_field(bmc_fieldset, 'provider', 'select');
-
-  ip = $('#host_fencing_attrs_fence_ipmilan_address').val();
-  find_network_interface_field(bmc_fieldset, 'ip', 'input').val(ip);
-  username = $('#host_fencing_attrs_fence_ipmilan_username').val();
-  find_network_interface_field(bmc_fieldset, 'username', 'input').val(username);
-  password = $('#host_fencing_attrs_fence_ipmilan_password').val();
-  find_network_interface_field(bmc_fieldset, 'password', 'input').val(password);
-};
-
-function get_bmc_interface_form() {
-  return $('fieldset#interface').filter(function(index, fieldset){
-    type = find_network_interface_field($(fieldset), 'type', 'select');
-    return type.val() == 'Nic::BMC';
-  });
-};
+  function disable_fencing_form() {
+    $('#fencing_form').hide();
+    $('#fencing_disabled_notice').show();
+  }
+
+  function enable_fencing_form() {
+    $('#fencing_disabled_notice').hide();
+    $('#fencing_form').show();
+  }
+
+
+  $(document).on('change', '#fencing', function() { update_bmc_interface_form(); });
+  function update_bmc_interface_form() {
+    bmc_fieldset = get_bmc_interface_form();
+    selected_provider = find_network_interface_field(bmc_fieldset, 'provider', 'select');
+
+    ip = $('#host_fencing_fence_ipmilan_address').val();
+    find_network_interface_field(bmc_fieldset, 'ip', 'input').val(ip);
+    username = $('#host_fencing_fence_ipmilan_username').val();
+    find_network_interface_field(bmc_fieldset, 'username', 'input').val(username);
+    password = $('#host_fencing_fence_ipmilan_password').val();
+    find_network_interface_field(bmc_fieldset, 'password', 'input').val(password);
+  }
 
 
-$(document).ready(function() {
   $('fieldset#interface').each(function(idx, fieldset) {
     update_subnet_types(fieldset);
   });
-});
-
-$(document).on('change', 'fieldset#interface select.interface_subnet', function(event) {
-  fieldset = $(event.target).parents('fieldset#interface');
-  update_subnet_types(fieldset);
-});
-function update_subnet_types(fieldset) {
-  subnet_select = find_network_interface_field($(fieldset), 'subnet_id', 'select');
-  subnet_types = subnet_select.data('types');
-  help_message = subnet_types[subnet_select.val()];
-
-  if (!help_message || help_message == '') {
-    subnet_select.parent().next().empty();
-    return;
+  $(document).on('change', 'fieldset#interface select.interface_subnet', function(event) {
+    fieldset = $(event.target).parents('fieldset#interface');
+    update_subnet_types(fieldset);
+  });
+  function update_subnet_types(fieldset) {
+    subnet_select = find_network_interface_field($(fieldset), 'subnet_id', 'select');
+    subnet_types = subnet_select.data('types');
+    help_message = subnet_types[subnet_select.val()];
+
+    if (!help_message || help_message == '') {
+      subnet_select.parent().next().empty();
+      return;
+    }
+
+    subnet_select.parent().next().empty().append(
+      '<div><i class="glyphicon glyphicon-info-sign" /> ' + help_message + '</div>');
   }
-
-  subnet_select.parent().next().empty().append(
-    '<div><i class="glyphicon glyphicon-info-sign" /> ' + help_message + '</div>');
-};
+});

data/app/lib/staypuft/network_query.rb

@@ -67,6 +67,10 @@ module Staypuft
       gateway_hash_for_host(host)[:interface]
     end
 
+    def gateway_interface_mac(host=@host)
+      gateway_hash_for_host(host)[:mac]
+    end
+
     def controllers
       @controllers ||= @deployment.controller_hostgroup.hosts.order(:id)
     end
@@ -101,7 +105,7 @@ module Staypuft
     class Jail < Safemode::Jail
       allow :ip_for_host, :interface_for_host, :network_address_for_host,
             :controller_ip, :controller_ips, :controller_fqdns, :get_vip,
-            :subnet_for_host, :gateway_subnet, :gateway_interface
+            :subnet_for_host, :gateway_subnet, :gateway_interface, :gateway_interface_mac
     end
 
     private

data/app/lib/staypuft/seeder.rb

@@ -277,19 +277,19 @@ module Staypuft
       cinder_rbd_secret_uuid                  = { :string => '<%= @host.deployment.cinder.rbd_secret_uuid %>' }
 
       cinder_backend_eqlx           = { :string => '<%= @host.deployment.cinder.equallogic_backend? %>' }
-      cinder_backend_eqlx_name      = ['eqlx_backend']
+      cinder_backend_eqlx_name      = { :array => '<%= @host.deployment.cinder.compute_eqlx_backend_names %>'}
       # TODO: confirm these params and add them to model where user input is needed
       # below dynamic calls are commented out since the model does not yet have san/chap entries
       cinder_san_ip                 = { :array => '<%= @host.deployment.cinder.compute_eqlx_san_ips %>' }
       cinder_san_login              = { :array => '<%= @host.deployment.cinder.compute_eqlx_san_logins %>' }
       cinder_san_password           = { :array => '<%= @host.deployment.cinder.compute_eqlx_san_passwords %>' }
       cinder_eqlx_group_name        = { :array => '<%= @host.deployment.cinder.compute_eqlx_group_names %>' }
-      cinder_eqlx_pool              = { :array => '<%= @host.deployment.cinder.compute_eqlx_pools %>'}
+      cinder_eqlx_pool              = { :array => '<%= @host.deployment.cinder.compute_eqlx_pools %>' }
 
-      cinder_san_thin_provision     = ['false']
-      cinder_eqlx_use_chap          = ['false']
-      cinder_eqlx_chap_login        = ['']
-      cinder_eqlx_chap_password     = ['']
+      cinder_san_thin_provision     = { :array => '<%= @host.deployment.cinder.compute_eqlx_thin_provision %>' }
+      cinder_eqlx_use_chap          = { :array => '<%= @host.deployment.cinder.compute_eqlx_use_chap %>' }
+      cinder_eqlx_chap_login        = { :array => '<%= @host.deployment.cinder.compute_eqlx_chap_logins %>' }
+      cinder_eqlx_chap_password     = { :array => '<%= @host.deployment.cinder.compute_eqlx_chap_passwords %>' }
 
       # Keystone
       keystonerc = 'true'

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

@@ -0,0 +1,28 @@
+module Staypuft
+  module Concerns
+    module HostFencingExtensions
+      extend ActiveSupport::Concern
+
+      FENCING_TYPES = {
+        'fence_ipmilan' => 'IPMI'
+      }
+
+      included do
+        define_method :fencing do
+          instance_variable_get(:@fencing_config) or
+            instance_variable_set(:@fencing_config, ::Staypuft::Host::Fencing.new(self))
+        end
+
+        define_method :fencing= do |value|
+          fencing.update(value)
+        end
+
+        validates_associated :fencing
+      end
+    end
+  end
+end
+
+class ::Host::Managed::Jail < Safemode::Jail
+  allow :bmc_nic
+end

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

@@ -19,10 +19,6 @@ module Staypuft
   end
 end
 
-class ::Host::Managed::Jail < Safemode::Jail
-  allow :bmc_nic
-end
-
 class ::Nic::Base::Jail < Safemode::Jail
   allow :fencing_enabled?, :attrs, :username, :password, :expose_lanplus?
 end

data/app/models/staypuft/deployment/cinder_service/equallogic.rb

@@ -5,12 +5,17 @@ module Staypuft
     include ActiveModel::Validations
     extend ActiveModel::Naming
 
-    attr_accessor :id, :san_ip, :san_login, :san_password, :pool, :group_name
+    attr_accessor :id, :san_ip, :san_login, :san_password, :pool, :group_name,
+                  :thin_provision, :use_chap, :chap_login, :chap_password
     attr_reader :errors
 
     def initialize(attrs = {})
       @errors = ActiveModel::Errors.new(self)
       self.attributes = attrs
+      self.thin_provision = false
+      self.use_chap = false
+      self.chap_login = ''
+      self.chap_password = ''
     end
 
     def self.human_attribute_name(attr, options = {})
@@ -22,7 +27,9 @@ module Staypuft
     end
 
     def attributes
-      { 'san_ip' => nil, 'san_login' => nil, 'san_password' => nil, 'pool' => nil, 'group_name' => nil }
+      { 'san_ip' => nil, 'san_login' => nil, 'san_password' => nil, 'pool' => nil,
+        'group_name' => nil, 'thin_provision' => nil, 'use_chap' => nil,
+        'chap_login' => nil, 'chap_password' => nil }
     end
 
     def attributes=(attrs)

data/app/models/staypuft/deployment/cinder_service.rb

@@ -61,7 +61,9 @@ module Staypuft
       allow :lvm_backend?, :nfs_backend?, :ceph_backend?, :equallogic_backend?,
         :multiple_backends?, :rbd_secret_uuid, :nfs_uri, :eqlxs, :eqlxs_attributes=,
         :compute_eqlx_san_ips, :compute_eqlx_san_logins, :compute_eqlx_san_passwords,
-        :compute_eqlx_group_names, :compute_eqlx_pools
+        :compute_eqlx_group_names, :compute_eqlx_pools, :compute_eqlx_thin_provision,
+        :compute_eqlx_use_chap, :compute_eqlx_chap_logins, :compute_eqlx_chap_passwords,
+        :compute_eqlx_backend_names
     end
 
     def set_defaults
@@ -121,12 +123,22 @@ module Staypuft
       Ptable.find_by_name('LVM with cinder-volumes')
     end
 
-    %w{san_ip san_login san_password group_name pool}.each do |name|
+    %w{san_ip san_login san_password group_name pool chap_login chap_password}.each do |name|
       define_method "compute_eqlx_#{name}s" do
         self.eqlxs.collect { |e| e.send name }
       end
     end
 
+    %w{thin_provision use_chap}.each do |name|
+      define_method "compute_eqlx_#{name}" do
+        self.eqlxs.collect { |e| e.send name }
+      end
+    end
+
+    def compute_eqlx_backend_names
+      self.eqlxs.collect.with_index { |e,i| "eqlx_backend#{i+1}" }
+    end
+
     private
 
     def set_lvm_ptable

data/app/models/staypuft/host/fencing.rb

@@ -0,0 +1,55 @@
+module Staypuft
+  module Host
+    class Fencing
+      include ActiveModel::Validations
+
+      FENCING_ATTRS = {
+        'general' => ['fencing_enabled',
+                      'fencing_type'],
+        'fence_ipmilan' => ['fence_ipmilan_address',
+                            'fence_ipmilan_username',
+                            'fence_ipmilan_password',
+                            'fence_ipmilan_expose_lanplus',
+                            'fence_ipmilan_lanplus_options']
+      }
+
+      validates :fencing_type, :presence => true, :if => Proc.new { |f|
+        f.fencing_enabled == '1' &&
+          @host.interfaces.any?{ |nic| nic.type == 'Nic::BMC' && !nic.marked_for_destruction? }
+      }
+
+      def initialize(host)
+        @host = host
+        FENCING_ATTRS.each do |key, attrs|
+          attrs.each do |name|
+            instance_var_name  = :"@#{name}"
+            value = host.bmc_nic.attrs[name] if host.bmc_nic && host.bmc_nic.attrs.has_key?(name)
+            self.class.send(:define_method, name) do
+              instance_variable_get(instance_var_name) or
+                instance_variable_set(instance_var_name, value)
+            end
+          end
+        end
+      end
+
+      def update(values)
+        values.each do |key, value|
+          instance_var_name  = :"@#{key}"
+          instance_variable_set(instance_var_name, value)
+        end
+
+        bmc_nics = @host.interfaces.select{ |interface| interface.type == "Nic::BMC" }
+        return if bmc_nics.empty?
+
+        bmc_nic = bmc_nics[0]
+        bmc_nic.attrs.merge!(values)
+        bmc_nic.save
+      end
+
+      # compatibility with validates_associated
+      def marked_for_destruction?
+        false
+      end
+    end
+  end
+end

data/app/views/hosts/_fencing.html.erb

@@ -1,23 +1,21 @@
 <div id="fencing_form">
-  <%= f.fields_for :fencing do |fencing_fields| %>
-    <%= fencing_fields.fields_for :attrs do |attrs_fields| %>
-      <%= checkbox_f attrs_fields, :fencing_enabled,
+  <%= f.fields_for :fencing, @host.fencing do |fencing_fields| %>
+      <%= checkbox_f fencing_fields, :fencing_enabled,
                                    label: _("Enable Fencing") %>
-      <%= select_f attrs_fields, :fencing_type, [_("IPMI")], :to_s, :to_s,
+      <%= select_f fencing_fields, :fencing_type, ::Host::Managed::FENCING_TYPES, :first, :last,
                                  { include_blank: true },
                                  { label: _("Type") } %>
-      <%= text_f attrs_fields, :fence_ipmilan_address,
+      <%= text_f fencing_fields, :fence_ipmilan_address,
                                label: _("IP Address") %>
-      <%= text_f attrs_fields, :fence_ipmilan_username,
+      <%= text_f fencing_fields, :fence_ipmilan_username,
                                label: _("Username")%>
-      <%= password_f attrs_fields, :fence_ipmilan_password,
+      <%= password_f fencing_fields, :fence_ipmilan_password,
                                    label: _("Password"),
                                    placeholder: '********' %>
-      <%= checkbox_f attrs_fields, :fence_ipmilan_expose_lanplus,
+      <%= checkbox_f fencing_fields, :fence_ipmilan_expose_lanplus,
                                    label: _("Expose Lanplus") %>
-      <%= text_f attrs_fields, :fence_ipmilan_lanplus_options,
+      <%= text_f fencing_fields, :fence_ipmilan_lanplus_options,
                                label: _("Lanplus Options") %>
-    <% end %>
   <% end %>
 </div>
 <div id="fencing_disabled_notice" style="display: none;">

data/config/routes.rb

@@ -22,10 +22,4 @@ Rails.application.routes.draw do
 
     resources :subnet_typings, :only => [:create, :destroy, :update]
   end
-
-  constraints(:id => /[^\/]+/) do
-    scope 'staypuft', module: 'staypuft' do
-      resources :hosts, as: 'staypuft_hosts'
-    end
-  end
 end

data/lib/staypuft/engine.rb

@@ -27,6 +27,7 @@ module Staypuft
     end
 
     config.to_prepare do
+      # Model concerns
       ::Host::Base.send :include, Staypuft::Concerns::HostInterfaceManagement
       ::Host::Managed.send :include, Staypuft::Concerns::HostOrchestrationBuildHook
       ::Host::Managed.send :include, Staypuft::Concerns::HostOpenStackAffiliation
@@ -38,6 +39,7 @@ module Staypuft
       ::Hostgroup.send :include, Staypuft::Concerns::HostgroupExtensions
       ::Environment.send :include, Staypuft::Concerns::EnvironmentExtensions
       ::LookupKey.send :include, Staypuft::Concerns::LookupKeyExtensions
+      ::Host::Managed.send :include, Staypuft::Concerns::HostFencingExtensions
       ::Nic::Base.send :include, Staypuft::Concerns::NicFencingExtensions
 
       # preload all the Foreman's lib files but only in production

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.3.7'
+  VERSION = '0.3.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
@@ -96,7 +96,6 @@ files:
 - app/assets/stylesheets/staypuft/staypuft.css.scss
 - app/controllers/staypuft/application_controller.rb
 - app/controllers/staypuft/subnet_typings_controller.rb
-- app/controllers/staypuft/hosts_controller.rb
 - app/controllers/staypuft/interface_assignments_controller.rb
 - app/controllers/staypuft/steps_controller.rb
 - app/controllers/staypuft/deployments_controller.rb
@@ -116,6 +115,7 @@ files:
 - app/models/staypuft/deployment/passwords.rb
 - app/models/staypuft/service_class.rb
 - app/models/staypuft/subnet_type.rb
+- app/models/staypuft/host/fencing.rb
 - app/models/staypuft/layout.rb
 - app/models/staypuft/concerns/vip_nic_scopes.rb
 - app/models/staypuft/concerns/hostgroup_extensions.rb
@@ -126,6 +126,7 @@ files:
 - app/models/staypuft/concerns/environment_extensions.rb
 - app/models/staypuft/concerns/host_interface_management.rb
 - app/models/staypuft/concerns/host_orchestration_build_hook.rb
+- app/models/staypuft/concerns/host_fencing_extensions.rb
 - app/models/staypuft/concerns/lookup_key_extensions.rb
 - app/models/staypuft/concerns/host_open_stack_affiliation.rb
 - app/models/staypuft/role_service.rb

data/app/controllers/staypuft/hosts_controller.rb

@@ -1,17 +0,0 @@
-module Staypuft
-  class HostsController < ::HostsController
-
-    before_filter :set_fencing_params, only: 'update'
-
-    private
-    def set_fencing_params
-      fencing_params = params['host'].delete('fencing')
-
-      if fencing_params['attrs']['fencing_enabled'] == '1'
-        host_attrs = params['host']['interfaces_attributes'].values.find{|host_attrs| host_attrs['provider'] == 'IPMI'}
-        host_attrs.merge!(fencing_params)
-      end
-    end
-
-  end
-end