staypuft 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb78ba28b433c78bd8f8d9a1f0cc5a4c4cc185a6
-  data.tar.gz: 0eb3ff52a83c0fa63e4dee33dfc37c2e6eeffeef
+  metadata.gz: 8fdb7f5ba17853a2b098fcf45e3a0a9798a92e1e
+  data.tar.gz: ade7196f14eac31b51265ade7c16c13f4a7db384
 SHA512:
-  metadata.gz: 959238ed73d99ddda11f7e4257a5163e12fccb6e9b42d31aeeda6d0eb746de40845305972a2003696d4838f3537a976f4b538861d7761a5b9995c195520f2b8b
-  data.tar.gz: 1632029a27cdc779f060aaf6f026cebcca45521620e83e3de78835fe2ddb58575e611387e3a63df8557ef4eccc9b111d5b5f13de2ed0226dda6ed3f6e8382e87
+  metadata.gz: 055e98568db7d185ccc3d92013a7c59931b3b8602e4daa414af70091096557d805e2df95fb16baa0a437b4a23770354d3b4f400cf370ee45e1cc597ebd6c77be
+  data.tar.gz: 1f140055e26614e19ab63d42897f76ed04691fe724821e8bdb7c49863a4abedd5dff64e1697c98ba4a2e62d4293b718a457af653a9e719731160f2116420d6ed

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

@@ -1,3 +1,11 @@
+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;
+};
+
+
 $(document).ready(function() {
   update_fencing_form();
   // NOTE: setTimeout is required to make sure this code runs after all event
@@ -55,23 +63,8 @@ function override_ajax_submit() {
   });
 };
 
-$(document).on('change', 'fieldset#interface', function() { update_fencing_form(); });
-$(document).on('change', '#fencing', function() { update_bmc_interface_form(); });
-
-function get_value_from_network_interface_form(fieldset, field, html_input_type) {
-  label = fieldset.find("label[for='" + field + "']");
-  html_input = label.parent().find(html_input_type);
-
-  return html_input;
-};
-
-function get_bmc_interface_form() {
-  return $('fieldset#interface').filter(function(index, fieldset){
-    type = get_value_from_network_interface_form($(fieldset), 'type', 'select');
-    return type.val() == 'Nic::BMC';
-  });
-}
 
+$(document).on('change', 'fieldset#interface', function() { update_fencing_form(); });
 function update_fencing_form() {
   bmc_fieldset = get_bmc_interface_form();
   if (bmc_fieldset.length == 0) {
@@ -81,34 +74,68 @@ function update_fencing_form() {
     enable_fencing_form();
   }
 
-  selected_provider = get_value_from_network_interface_form(bmc_fieldset, 'provider', 'select');
+  selected_provider = find_network_interface_field(bmc_fieldset, 'provider', 'select');
 
-  ip = get_value_from_network_interface_form(bmc_fieldset, 'ip', 'input').val();
+  ip = find_network_interface_field(bmc_fieldset, 'ip', 'input').val();
   $('#host_fencing_attrs_fence_ipmilan_address').val(ip);
-  username = get_value_from_network_interface_form(bmc_fieldset, 'username', 'input').val();
+  username = find_network_interface_field(bmc_fieldset, 'username', 'input').val();
   $('#host_fencing_attrs_fence_ipmilan_username').val(username);
-  password = get_value_from_network_interface_form(bmc_fieldset, 'password', 'input').val();
+  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 = get_value_from_network_interface_form(bmc_fieldset, 'provider', 'select');
+  selected_provider = find_network_interface_field(bmc_fieldset, 'provider', 'select');
 
   ip = $('#host_fencing_attrs_fence_ipmilan_address').val();
-  get_value_from_network_interface_form(bmc_fieldset, 'ip', 'input').val(ip);
+  find_network_interface_field(bmc_fieldset, 'ip', 'input').val(ip);
   username = $('#host_fencing_attrs_fence_ipmilan_username').val();
-  get_value_from_network_interface_form(bmc_fieldset, 'username', 'input').val(username);
+  find_network_interface_field(bmc_fieldset, 'username', 'input').val(username);
   password = $('#host_fencing_attrs_fence_ipmilan_password').val();
-  get_value_from_network_interface_form(bmc_fieldset, 'password', 'input').val(password);
+  find_network_interface_field(bmc_fieldset, 'password', 'input').val(password);
 };
 
-function disable_fencing_form() {
-  $('#fencing_form').hide();
-  $('#fencing_disabled_notice').show();
+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 enable_fencing_form() {
-  $('#fencing_disabled_notice').hide();
-  $('#fencing_form').show();
+
+$(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;
+  }
+
+  subnet_select.parent().next().empty().append(
+    '<div><i class="glyphicon glyphicon-info-sign" /> ' + help_message + '</div>');
 };

data/app/helpers/staypuft/hosts_helper.rb

@@ -0,0 +1,17 @@
+module Staypuft
+  module HostsHelper
+
+    def list_subnet_types(nic, subnets)
+      types = {}
+
+      return types if nic.host.nil? || nic.host.deployment.nil?
+
+      subnets.each do |subnet|
+        types[subnet.id] = subnet_types(nic.host.deployment, subnet)
+      end
+
+      return types
+    end
+
+  end
+end

data/app/lib/staypuft/seeder.rb

@@ -236,7 +236,7 @@ module Staypuft
       ml2_tenant_network_types    = [ tenant_network_type ]
       ml2_tunnel_id_ranges        = ['10:1000']
       ml2_vni_ranges              = ['10:1000']
-      ovs_tunnel_types            = ['vxlan', 'gre']
+      ovs_tunnel_types            = { :array =>  '<%= @host.deployment.neutron.ovs_tunnel_types %>' }
       ovs_tunnel_iface            = { :string => '<%= n = @host.deployment.neutron; n.enable_tunneling? ? n.tenant_iface(@host) : "" %>' }
       ovs_bridge_mappings         = { :array =>  '<%= @host.deployment.neutron.networker_ovs_bridge_mappings(@host) %>' }
       ovs_bridge_uplinks          = { :array =>  '<%= @host.deployment.neutron.networker_ovs_bridge_uplinks(@host) %>' }
@@ -359,9 +359,9 @@ module Staypuft
       fence_ipmilan_address          = { :string => '<%= @host.bmc_nic.ip if @host.bmc_nic && @host.bmc_nic.fencing_enabled? %>' }
       fence_ipmilan_username         = { :string => '<%= @host.bmc_nic.username if @host.bmc_nic && @host.bmc_nic.fencing_enabled? %>' }
       fence_ipmilan_password         = { :string => '<%= @host.bmc_nic.password if @host.bmc_nic && @host.bmc_nic.fencing_enabled? %>' }
-      fence_ipmilan_interval         = { :string => '<%= "60s" if @host.bmc_nic && @host.bmc_nic.fencing_enabled? %>' }
-      fence_ipmilan_hostlist         = { :string => '<%= "" if @host.bmc_nic && @host.bmc_nic.fencing_enabled? %>' }
-      fence_ipmilan_host_to_address  = { :array =>  '<%= [] if @host.bmc_nic && @host.bmc_nic.fencing_enabled? %>' }
+      fence_ipmilan_interval         = '60s'
+      fence_ipmilan_hostlist         = ''
+      fence_ipmilan_host_to_address  = []
       fence_ipmilan_expose_lanplus   = { :string => '<%= @host.bmc_nic.expose_lanplus? if @host.bmc_nic && @host.bmc_nic.fencing_enabled? %>' }
       fence_ipmilan_lanplus_options  = { :string => '<%= @host.bmc_nic.attrs["fence_ipmilan_lanplus_options"] if @host.bmc_nic && @host.bmc_nic.fencing_enabled? %>' }
 

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

@@ -54,7 +54,8 @@ module Staypuft
     validates :eqlxs,
               :presence   => true,
               :if         => :equallogic_backend?
-    validate :equallogic_backends
+    validate :equallogic_backends,
+             :if          => :equallogic_backend?
 
     class Jail < Safemode::Jail
       allow :lvm_backend?, :nfs_backend?, :ceph_backend?, :equallogic_backend?,

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

@@ -41,7 +41,7 @@ module Staypuft
     class Jail < Safemode::Jail
       allow :networker_vlan_ranges, :compute_vlan_ranges, :network_segmentation, :enable_tunneling?,
         :tenant_iface, :networker_ovs_bridge_mappings, :networker_ovs_bridge_uplinks,
-        :compute_ovs_bridge_mappings, :compute_ovs_bridge_uplinks
+        :compute_ovs_bridge_mappings, :compute_ovs_bridge_uplinks, :ovs_tunnel_types
     end
 
     def set_defaults
@@ -98,6 +98,17 @@ module Staypuft
       deployment.network_query.interface_for_host(host, Staypuft::SubnetType::EXTERNAL)
     end
 
+    def ovs_tunnel_types
+      case network_segmentation
+      when NetworkSegmentation::VXLAN
+        ['vxlan']
+      when NetworkSegmentation::GRE
+        ['gre']
+      else
+        []
+      end
+    end
+
     def param_hash
       { 'network_segmentation'       => network_segmentation,
         'tenant_vlan_ranges'         => tenant_vlan_ranges }

data/app/overrides/nic_base_form.rb

@@ -0,0 +1,11 @@
+# older deface requires code prefix for erb tags
+if Gem.loaded_specs['deface'].version >= Gem::Version.new('1.0.0')
+  erb_tag = 'erb[loud]'
+else
+  erb_tag = 'code[erb-loud]'
+end
+
+Deface::Override.new(:virtual_path => "nic/_base_form",
+                     :name => "add_network_types_to_subnet",
+                     :replace => "erb[loud]:contains(':subnet_id')",
+                     :template => "nic/_subnet_id_field")

data/app/views/nic/_subnet_id_field.html.erb

@@ -0,0 +1,7 @@
+<%= select_f f, :subnet_id, accessible_subnets, :id, :to_label,
+             { :include_blank => accessible_subnets.any? ? true : _("No subnets")},
+             { :disabled => accessible_subnets.empty? ? true : false,
+               :help_inline => 'help_inline',
+               :class => 'interface_subnet',
+               'data-url' => freeip_subnets_path,
+               'data-types' => "#{list_subnet_types(f.object, accessible_subnets).to_json}" } %>

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.3.4'
+  VERSION = '0.3.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-10 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
@@ -136,6 +136,7 @@ files:
 - app/models/staypuft/subnet_typing.rb
 - app/models/staypuft/deployment_role_hostgroup.rb
 - app/models/setting/staypuft_provisioning.rb
+- app/overrides/nic_base_form.rb
 - app/overrides/customize_foreman_tasks_show_page.rb
 - app/overrides/foreman_hosts_edit.rb
 - app/overrides/hide_subscription_manager_passwords.rb
@@ -207,6 +208,8 @@ files:
 - app/views/staypuft/deployments/_import_form.html.erb
 - app/views/staypuft/deployments/_deployment_summary.html.erb
 - app/views/staypuft/deployments/_deployment_networking.html.erb
+- app/views/nic/_subnet_id_field.html.erb
+- app/helpers/staypuft/hosts_helper.rb
 - app/helpers/staypuft/deployments_helper.rb
 - app/helpers/staypuft/application_helper.rb
 - config/staypuft.local.rb