staypuft 0.4.9 → 0.4.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjU3ZWM3ZmMwMGNkNGY0YWFjNGQ2MzQzNTE3ZWFmMjRmNjFjNTFiNw==
+    YmJlNmExMjkyMzVlYjBjMzBlYzQzMDdjMDk5OGZjNmRkNTc5ZjI3OQ==
   data.tar.gz: !binary |-
-    ZDM2NDlmNGZiNGI2MjQ1ZDIzMDA3YjQ4OTA3MDY5OTM3ZWU1ZTdmMw==
+    NzI0OWYxMWNmYjY0YTVjNDA2NmNhMDRlMDQzOTQ3YTVmMTBkNDlkZg==
 SHA512:
   metadata.gz: !binary |-
-    ZTQwNGEzYWFmMDM0NzQ5ZjAzYzVhMWQwNDAxMmNlNjYwMDRhNTFiZGUxMGYw
-    YmE0YjcyMzNiZDE3OGE5NDFhYzE2ZjllY2VkODczYTA4M2RiYTI1N2M4ZWI0
-    MTgxMjhiMjkwZjUzNTMwYTU2NDc0OWNmMTliOGI3ODJkY2E3ZDk=
+    ZjliYTY2ZDMzOTNhZTk3MzBjYmRhNzA0NDJjMDZhNDc2MjYyYjliZDFmNGU0
+    M2U3MGVlNDIzNDQ0OTY2YTZiYjY0MjZmNDg1ODY0M2UxZjJjYzBjZThkZjk5
+    NTg0YmY0YmM2ZGI4ZTc0NWJhMDc5NDRhZWY1OWEyNTE0NTJiZDI=
   data.tar.gz: !binary |-
-    ODZkY2NiM2YwOWIxODJhNmY4MmQzZjFmMDNhYWE4NjU0ZTZmNjlkYzNkZjBl
-    ZTFjNTk2Zjk2ODNiMzlkM2IxZTM2NDA4YThiZjg4OGRmZjRkMGMxZjMyODlm
-    OWMyZGY5NmVmZWU4ZGJlMGIyN2YyZTM5YzIxYzYzNjEwNzBiNjU=
+    ZmJkYTcyOTg0ZDAxZTQzMDFmNTUzNzM0MjhiZDlkZDQ1OTAxOTcyYzczZDlk
+    NjZkNTQ0NzFlMDQ5NjIyNTBiMmE5YTcyNTA1NzdhY2ZjYTI2NWM4NDllMTMw
+    MDc3NTZmN2MzMjNkODZiMzliNzhlYzMwOTllMDg0Mjc4MDJiMTA=

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

@@ -75,14 +75,21 @@ $(function() {
 
 
   $('fieldset#interface').each(function(idx, fieldset) {
-    update_subnet_types(fieldset);
+    subnet_select = find_network_interface_field($(fieldset), 'subnet_id', 'select');
+    update_subnet_types(subnet_select);
   });
   $(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');
+    update_subnet_types(subnet_select);
+  });
+  $('#host_subnet_id').each(function(idx, subnet_select) {
+    update_subnet_types($(subnet_select));
+  });
+  $(document).on('change', 'select#host_subnet_id', function(event) {
+    update_subnet_types($(event.target));
+  });
+  function update_subnet_types(subnet_select) {
     subnet_types = subnet_select.data('types');
     help_message = subnet_types[subnet_select.val()];
 

data/app/helpers/staypuft/hosts_helper.rb

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

data/app/lib/staypuft/seeder.rb

@@ -701,6 +701,7 @@ module Staypuft
               'pcmk_fs_options' => pcmk_fs_options },
           'quickstack::pacemaker::cinder'          => {
               'volume'                           => volume,
+              'multiple_backends'                => cinder_multiple_backends,
               'backend_iscsi'                    => cinder_backend_iscsi,
               'backend_nfs'                      => cinder_backend_nfs,
               'backend_gluster'                  => cinder_backend_gluster,

data/app/models/staypuft/interface_assigner.rb

@@ -110,7 +110,7 @@ module Staypuft
     end
 
     def unassign_physicals
-      @host.interfaces.physical.where(:subnet_id => @subnet.id).each do |interface|
+      @host.interfaces.physical.non_vip.where(:subnet_id => @subnet.id).each do |interface|
         unassign_physical(interface)
       end
     end

data/app/overrides/hosts_edit_subnet_types.rb

@@ -0,0 +1,21 @@
+# 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_on_nic",
+                     :replace => "#{erb_tag}:contains(':subnet_id')",
+                     :template => "nic/_subnet_id_field")
+
+Deface::Override.new(:virtual_path => "hosts/_unattended",
+                     :name => "add_network_types_to_subnet_on_primary_interface",
+                     :replace => "span#subnet_select",
+                     :template => "hosts/_primary_interface_subnet")
+
+Deface::Override.new(:virtual_path => "hosts/_unattended",
+                     :name => "add_network_types_to_subnet_on_new_nic_form",
+                     :replace => "#{erb_tag}:contains('new_child_fields_template')",
+                     :template => "hosts/_new_nic_fields")

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

@@ -0,0 +1 @@
+<%= new_child_fields_template(f, :interfaces, {:partial => Nic::Managed.new, :object => Nic::Managed.new(:host => @host), :layout => 'nic/interface_layout'}) %>

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

@@ -0,0 +1,14 @@
+<span id="subnet_select">
+  <%= fields_for @host do |f| %>
+    <%= select_f f, :subnet_id, domain_subnets, :id, :to_label,
+                 { :include_blank => domain_subnets.any? ? blank_or_inherit_f(f, :subnet) : _("No subnets") },
+                 { :disabled => domain_subnets.empty?,
+                   :data     => { :url     => SETTINGS[:unattended] ? freeip_subnets_path : '',
+                                  :subnets => subnets_ipam_data.to_json,
+                                  :types => list_subnet_types_for_host(@host, domain_subnets).to_json },
+                   :label    => _("Subnet"),
+                   :help_inline => :indicator,
+                   :onchange => 'subnet_selected(this);' }
+    %>
+  <% end %>
+</span>

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

@@ -2,5 +2,8 @@
              { :include_blank => accessible_subnets.any? ? true : _("No subnets")},
              { :disabled => accessible_subnets.empty? ? true : false,
                :class => 'interface_subnet',
-               'data-url' => freeip_subnets_path,
-               'data-types' => "#{list_subnet_types(f.object, accessible_subnets).to_json}" } %>
+               :data => {
+                 :url => freeip_subnets_path,
+                 :types => list_subnet_types_for_nic(f.object, accessible_subnets).to_json
+               }
+             } %>

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

@@ -41,20 +41,12 @@
                   <%= label_tag param_hash[:param_key].key %>
                 </div>
                 <div class="col-md-8">
-                  <%= text_field_tag format("staypuft_deployment[hostgroup_params][%s][puppetclass_params][%s][%s]",
-                                            param_hash[:hostgroup].id,
-                                            param_hash[:puppetclass].id,
-                                            param_hash[:param_key].key),
-                                     value     = param_hash[:hostgroup].current_param_value_str(param_hash[:param_key]),
-                                     :class    => "form-control",
-                                     :size     => "45",
-                                     disabled: true %>
-                  <% if Staypuft::Concerns::LookupKeyExtensions.has_erb? value %>
-                    <span class="help-block">
-                      <%= _('evaluates to: ') %>
-                      <%= Staypuft::Concerns::LookupKeyExtensions.evaluate_value param_hash[:hostgroup], value %>
-                    </span>
-                  <% end %>
+                  <%= render "param_field", {:hostgroup => param_hash[:hostgroup],
+                                            :puppetclass => param_hash[:puppetclass],
+                                            :param_key => param_hash[:param_key],
+                                            :disabled => true,
+                                            :show_evaluation => true
+                                            } %>
                 </div>
               </div>
               <br/>

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

@@ -0,0 +1,27 @@
+                  <% input_name = format("staypuft_deployment[hostgroup_params][%s][puppetclass_params][%s][%s]",
+                                            hostgroup.id,
+                                            puppetclass.id,
+                                            param_key.key)
+                     param_value = hostgroup.current_param_value_str(param_key)
+                  %>
+                  <% unless param_key.key_type.to_sym == :hash %>
+                  <%= text_field_tag input_name,
+                                     param_value,
+                                     { :class    => "form-control",
+                                       :size     => "45",
+                                       disabled: local_assigns[:disabled] } %>
+                  <% else %>
+                  <%= text_area_tag input_name,
+                                    param_value,
+                                    { :class    => "form-control",
+                                      :size     => "5",
+                                      disabled: local_assigns[:disabled] } %>
+                  <% end %>
+                  <% if local_assigns[:show_evaluation] %>
+                    <% if Staypuft::Concerns::LookupKeyExtensions.has_erb? param_value %>
+                      <span class="help-block">
+                        <%= _('evaluates to: ') %>
+                        <%= Staypuft::Concerns::LookupKeyExtensions.evaluate_value hostgroup, param_value %>
+                      </span>
+                    <% end %>
+                  <% end %>

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

@@ -36,13 +36,11 @@
                     <%= label_tag param_hash[:param_key].key %>
                   </div>
                   <div class="col-md-5">
-                    <%= text_field_tag format("staypuft_deployment[hostgroup_params][%s][puppetclass_params][%s][%s]",
-                                              param_hash[:hostgroup].id,
-                                              param_hash[:puppetclass].id,
-                                              param_hash[:param_key].key),
-                                       param_hash[:hostgroup].current_param_value_str(param_hash[:param_key]),
-                                       :class => "form-control",
-                                       :size  => "45" %>
+                    <%= render "param_field", {:hostgroup => param_hash[:hostgroup],
+                                              :puppetclass => param_hash[:puppetclass],
+                                              :param_key => param_hash[:param_key],
+                                              :disabled => false
+                                              } %>
                   </div>
                 </div>
                 <br/>

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.4.9'
+  VERSION = '0.4.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - Staypuft team
@@ -184,9 +184,11 @@ files:
 - app/overrides/customize_foreman_tasks_show_page.rb
 - app/overrides/foreman_hosts_edit.rb
 - app/overrides/hide_subscription_manager_passwords.rb
-- app/overrides/nic_base_form.rb
+- app/overrides/hosts_edit_subnet_types.rb
 - app/overrides/select_multiple_systems_hostgroup.rb
 - app/views/hosts/_fencing.html.erb
+- app/views/hosts/_new_nic_fields.html.erb
+- app/views/hosts/_primary_interface_subnet.html.erb
 - app/views/nic/_subnet_id_field.html.erb
 - app/views/staypuft/bonds/add_slave.js.erb
 - app/views/staypuft/bonds/create.js.erb
@@ -213,6 +215,7 @@ files:
 - app/views/staypuft/deployments/_hosts_header.html.erb
 - app/views/staypuft/deployments/_hosts_table.html.erb
 - app/views/staypuft/deployments/_import_form.html.erb
+- app/views/staypuft/deployments/_param_field.html.erb
 - app/views/staypuft/deployments/edit.html.erb
 - app/views/staypuft/deployments/index.html.erb
 - app/views/staypuft/deployments/show.html.erb

data/app/overrides/nic_base_form.rb

@@ -1,11 +0,0 @@
-# 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_tag}:contains(':subnet_id')",
-                     :template => "nic/_subnet_id_field")