staypuft 0.5.19 → 0.5.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33b797789ba713b33c1db4e2a09d4feec861bfb4
-  data.tar.gz: a9f26aee683a285766a58ce98d6164cb3d575d26
+  metadata.gz: 07df5121c287c8805d1258989d69df3bdfc5998a
+  data.tar.gz: 76ea84cf1ba8468f2e6b44369e362410e725e550
 SHA512:
-  metadata.gz: e94ea349578792352fa803ecd4a5f51a5281a44689f514338086c105455292c7b1b8fe93b5d34466ca020df2dde81a2fd25ab51a4348b9e71bb3df154b320cf8
-  data.tar.gz: b7ef4a76c194540fca97a676ef6cffbb015227f2c418738a72186ee1aab17d88bd09c4f46dfd8c20122f43584069e909fa1ec99c56c80860c2d65a022f64015b
+  metadata.gz: b579d2517979c055f44f0cf226208c5d57a00c578bc3abfcffd3b502c4c8c8620f3ef7829cd40e3d83d0819b101341b0c1f1f7343cba9794903138adc9de587d
+  data.tar.gz: da35efa013daf0b6b644aa265130b06ea634c47d6e65b3cc1278dab8efc3b731417edc74b43bf8a115b9ccf77c182a41687027d995f5635145303241507de9e1

data/app/helpers/staypuft/deployments_helper.rb

@@ -52,6 +52,14 @@ module Staypuft
       host.interfaces_identifiers.compact.sort.join(tag(:br)).html_safe
     end
 
+    def host_nics_with_subnets(host)
+      nics_list = ""
+      host.interfaces_identifiers_with_subnets.each do |nic_plus_subnet|
+        nics_list += nic_plus_subnet[0] + " (#{nic_plus_subnet[1]})" + tag(:br)
+      end
+      nics_list.html_safe
+    end
+
     def host_disks(host)
       hosts_facts = FactValue.joins(:fact_name).where(host_id: host.id)
       host.blockdevices.collect do |blockdevice|

data/app/lib/staypuft/seeder.rb

@@ -277,7 +277,7 @@ module Staypuft
                                                       'network_auto_schedule' => 'default' }
                                         }
       neutron_network_device_mtu  = { :string => '<%= @host.deployment.neutron.compute_network_device_mtu %>' }
-
+      l3_ha                       = { :string => "<%= @host.deployment.neutron.l3_ha.to_s %>" }
       # Glance
       glance                      = { :string => '<%= @host.deployment.glance.ceph_backend? ? "false" : "true" %>'}
       backend                     = { :string => '<%= @host.deployment.glance.backend %>' }
@@ -340,16 +340,11 @@ module Staypuft
 
       # Ceph
       ceph_cluster_network      = { :string => "<%= @host.network_query.network_address_for_host('#{Staypuft::SubnetType::STORAGE_CLUSTERING}') %>" }
-      # FIXME: this should actually be STORAGE instead of PXE, but only after we have a reliable way of identifying DNS names
-      #        on the storage network
-      ceph_public_network      = { :string => "<%= @host.network_query.network_address_for_host('#{Staypuft::SubnetType::PXE}') %>" }
+      ceph_public_network      = { :string => "<%= @host.network_query.network_address_for_host('#{Staypuft::SubnetType::STORAGE}') %>" }
       ceph_fsid                = { :string => '<%= @host.deployment.ceph.fsid %>' }
       ceph_images_key          = { :string => '<%= @host.deployment.ceph.images_key %>' }
       ceph_volumes_key         = { :string => '<%= @host.deployment.ceph.volumes_key %>' }
-      # FIXME: this should move to STORAGE from PXE like above
       ceph_mon_host            = { :array => "<%= @host.network_query.controller_ips('#{Staypuft::SubnetType::STORAGE}') %>" }
-      # FIXME: This is currently the hostnames (which maps to fqdns on the PXE network) -- eventually we want DNS names
-      #        on the Storage network
       ceph_mon_initial_members = { :array => "<%= @host.deployment.ceph.mon_initial_members %>" }
       ceph_osd_pool_size       = { :string => '<%= @host.deployment.ceph.osd_pool_size %>' }
       ceph_osd_journal_size    = { :string => '<%= @host.deployment.ceph.osd_journal_size %>' }
@@ -530,6 +525,7 @@ module Staypuft
               'security_group_api'             => neutron_security_group_api,
               'network_device_mtu'             => neutron_network_device_mtu,
               'veth_mtu'                       => neutron_network_device_mtu,
+              'l3_ha'                          => l3_ha,
             },
           'quickstack::pacemaker::glance'          => {
               'backend'         => backend,

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

@@ -17,6 +17,16 @@ module Staypuft
         interfaces
       end
 
+      def interfaces_identifiers_with_subnets
+        interfaces = [ [self.primary_interface, self.subnet.name] ]
+        if self.respond_to?(:interfaces)
+          interfaces += self.interfaces.where("type <> 'Nic::BMC'").physical.map do |interface|
+            [interface.identifier, ((sub = interface.subnet) ? sub.name :  "")]
+          end
+        end
+        interfaces
+      end
+
       def make_all_interfaces_managed
         self.interfaces.each do |interface|
           interface.managed = true

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

@@ -0,0 +1,17 @@
+module Staypuft
+  module Concerns
+    module NicBondingExtensions
+      extend ActiveSupport::Concern
+
+      included do
+        before_save :ensure_mac
+      end
+
+      def ensure_mac
+        mac_addresses = self.host.interfaces.where(
+            :identifier => attached_devices_identifiers).pluck(:mac).compact
+        self.mac =  mac_addresses.first unless mac_addresses.include?(self.mac)
+      end
+    end
+  end
+end

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

@@ -103,7 +103,7 @@ module Staypuft
         :openvswitch_mechanism?, :l2population_mechanism?, :cisco_nexus_mechanism?,
         :ml2_mechanisms, :nexuses, :active?, :compute_cisco_nexus_config, :core_plugin,
         :ml2_plugin?, :n1kv_plugin?, :n1kv_vsm_ip, :n1kv_vsm_password,
-        :core_plugin_module, :network_device_mtu, :compute_network_device_mtu
+        :core_plugin_module, :network_device_mtu, :compute_network_device_mtu, :l3_ha
     end
 
     def set_defaults
@@ -208,6 +208,10 @@ module Staypuft
       Ml2Mechanisms::TYPES.map { |ml2_type| ml2_type if self.send("#{ml2_type}_mechanism?") }.compact
     end
 
+    def l3_ha
+      deployment.network_query.controllers.size > 1
+    end
+
     def param_hash
       { 'network_segmentation'       => network_segmentation,
         'core_plugin'                => core_plugin,

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

@@ -14,7 +14,11 @@
           <th><%= _("CPUs") %><br/><span class="text-muted small"><%= _("(cores)") %></span></th>
           <th><%= _("Memory") %><br/><span class="text-muted small"><%= _("(GB)") %></span></th>
           <th><%= _("Storage") %></th>
-          <th><%= _("NICs") %></th>
+          <% if local_assigns[:deployment_role_col] %>
+            <th><%= _("NICs (Subnet)") %></th>
+          <% else %>
+            <th><%= _("NICs") %></th>
+          <% end %>
           <th class="hidden-s hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>
         </tr>
       </thead>
@@ -43,7 +47,11 @@
             <td><%= host.cpus if host.respond_to?(:cpus) %></td>
             <td><%= host.mem if host.respond_to?(:mem) %></td>
             <td><%= host_disks(host) %></td>
-            <td><%= host_nics(host) %></td>
+            <% if local_assigns[:deployment_role_col] %>
+              <td><%= host_nics_with_subnets(host) %></td>
+            <% else %>
+              <td><%= host_nics(host) %></td>
+            <% end %>
             <td class="hidden-s hidden-xs"><%= host.ip %></td>
           </tr>
         <% end %>

data/lib/staypuft/engine.rb

@@ -43,6 +43,7 @@ module Staypuft
       ::Api::V1::HostsController.send :include, Staypuft::Concerns::HostsApiExtensions
       ::Api::V2::HostsController.send :include, Staypuft::Concerns::HostsApiExtensions
       ::HostsController.send :include, Staypuft::Concerns::HostsControllerExtensions
+      ::Nic::Bond.send :include, Staypuft::Concerns::NicBondingExtensions
 
       # preload all the Foreman's lib files but only in production
       if Rails.env.production?

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.5.19'
+  VERSION = '0.5.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.5.19
+  version: 0.5.20
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
@@ -151,6 +151,7 @@ files:
 - 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/nic_bonding_extensions.rb
 - app/models/staypuft/concerns/host_open_stack_affiliation.rb
 - app/models/staypuft/role_service.rb
 - app/models/staypuft/service.rb