staypuft 0.3.1 → 0.3.2

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

@@ -5,35 +5,13 @@ module Staypuft
       'cinder'
     end
 
-    param_attr :driver_backend, :nfs_uri, :rbd_secret_uuid,
-               :san_ip, :san_login, :san_password, :eqlx_group_name, :eqlx_pool
-    after_save :set_lvm_ptable
+    BACKEND_TYPE_PARAMS = :backend_eqlx, :backend_nfs, :backend_lvm, :backend_ceph
+    BACKEND_PARAMS = :nfs_uri, :rbd_secret_uuid
 
-    class SanIpValueValidator < ActiveModel::EachValidator
-      def validate_each(record, attribute, value)        
-        return if value.empty?
-
-        begin
-          ip_addr = IPAddr.new(value)
-          ip_range = ip_addr.to_range
-          if ip_range.begin == ip_range.end
-            true
-          else
-            record.errors.add attribute, "Specify single IP address, not range"
-            false
-          end
-        rescue
-          # not IP addr
-          # validating as fqdn
-          if /(?=^.{1,254}$)(^(((?!-)[a-zA-Z0-9-]{1,63}(?<!-))|((?!-)[a-zA-Z0-9-]{1,63}(?<!-)\.)+[a-zA-Z]{2,63})$)/ =~ value
-            true
-          else
-            record.errors.add attribute, "Invalid IP address or FQDN supplied"
-            false
-          end
-        end
-      end
-    end
+    param_attr *BACKEND_TYPE_PARAMS, *BACKEND_PARAMS
+    param_attr_array :eqlxs => Equallogic
+
+    after_save :set_lvm_ptable
 
     module DriverBackend
       LVM        = 'lvm'
@@ -47,7 +25,7 @@ module Staypuft
       TYPES      = LABELS.keys
       HUMAN      = N_('Choose Driver Backend')
     end
-    validates :driver_backend, presence: true, inclusion: { in: lambda { |c| c.backend_types_for_layout } }
+    validate :at_least_one_backend_selected
 
     module NfsUri
       HUMAN       = N_('NFS URI:')
@@ -61,81 +39,36 @@ module Staypuft
     module SanIp
       HUMAN       = N_('SAN IP Addr:')
     end
-    validates :san_ip,
-              :presence     => true,
-              :if           => :equallogic_backend?,
-              :san_ip_value => true
-    # FIXME: Currently this only validates IP addresses, however hostnames are valid here
-    # too. In the absence of "IP or hostname" validation, is forcing IP only better than
-    # no validation, or should we disable this until it works for all valid values?
-
     module SanLogin
       HUMAN       = N_('SAN Login:')
     end
-    # Up to 16 alphanumeric characters, including period, hyphen, and underscore.
-    # First character must be a letter or number.  Last character cannot be a period.
-    # ASCII, Not Unicode
-    validates :san_login,
-              :presence => true,
-              :format   => /\A[a-zA-Z\d][\w\.\-]*[\w\-]\z/,
-              :length   => { maximum: 16 },
-              :if       => :equallogic_backend?
-
     module SanPassword
       HUMAN       = N_('SAN Password:')
     end
-    # Password must be 3 to 16 printable ASCII characters and is case-sensitive.
-    # Punctuation characters are allowed, but spaces are not.
-    # Only the first 8 characters are used, the rest are ignored (without a message).
-    # ASCII, Not Unicode
-    validates :san_password,
-              :presence => true,
-              :format   => /\A[!-~]+\z/,
-              :length   => { minimum:3, maximum: 16 },
-              :if       => :equallogic_backend?
-
     module EqlxPool
       HUMAN       = N_('Pool:')
     end
-    # Name can be up to 63 bytes and is case insensitive.
-    # You can use any printable Unicode character except for
-    # ! " # $ % & ' ( ) * + , / ; < = > ?@ [ \ ] ^ _ ` { | } ~.
-    # First and last characters cannot be a period, hyphen, or colon.
-    # Fewer characters are accepted for this field if you enter the value as a
-    # Unicode character string, which takes up a variable number of bytes,
-    # depending on the specific character.
-    # ASCII, Unicode
-    validates :eqlx_pool,
-              :presence => true,
-              :format   => /\A[[^\p{Z}\p{C}!"\#$%&'\(\)\*\+,\/;<=>\?@\[\]\\\^\{\}|~\.\-:]][[^\p{Z}\p{C}!"\#$%&'\(\)\*\+,\/;<=>\?@\[\]\\\^\{\}|~]]+[[^\p{Z}\p{C}!"\#$%&'\(\)\*\+,\/;<=>\?@\[\]\\\^\{\}|~\.\-:]]\z/,
-              :length   => { maximum: 63,
-                             too_long: "Too long: max length is %{count} bytes. Using multibyte characters reduces the maximum number of characters allowed.",
-                             tokenizer: lambda {|str| str.bytes.to_a } },
-              :if       => :equallogic_backend?
-
     module EqlxGroupName
       HUMAN       = N_('Group:')
     end
-    # Up to 54 alphanumeric characters and hyphens(dashes).
-    # The first character must be a letter or a number.
-    # ASCII, Not Unicode
-    validates :eqlx_group_name,
-              :presence => true,
-              :format   => /\A[a-zA-Z\d][a-zA-Z\d\-]*\z/,
-              :length   => { maximum: 54 },
-              :if       => :equallogic_backend?
+    validates :eqlxs,
+              :presence   => true,
+              :if         => :equallogic_backend?
+    validate :equallogic_backends
 
     class Jail < Safemode::Jail
-      allow :lvm_backend?, :nfs_backend?, :nfs_uri, :ceph_backend?, :equallogic_backend?,
-        :rbd_secret_uuid, :san_ip, :san_login, :san_password, :eqlx_group_name, :eqlx_pool
+      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
     end
 
     def set_defaults
-      self.driver_backend  = DriverBackend::LVM
+      self.backend_lvm = "false"
+      self.backend_ceph = "false"
+      self.backend_nfs = "false"
+      self.backend_eqlx = "false"
       self.rbd_secret_uuid = SecureRandom.uuid
-      self.san_login       = 'grpadmin'
-      self.eqlx_pool       = 'default'
-      self.eqlx_group_name = 'group-0'
     end
 
     # cinder config always shows up
@@ -144,21 +77,25 @@ module Staypuft
     end
 
     def lvm_backend?
-      !self.deployment.ha? && (self.driver_backend == DriverBackend::LVM)
+      !self.deployment.ha? && self.backend_lvm == "true"
     end
 
     def nfs_backend?
-      self.driver_backend == DriverBackend::NFS
+      self.backend_nfs == "true"
     end
 
     def ceph_backend?
-      self.driver_backend == DriverBackend::CEPH
+      self.backend_ceph == "true"
     end
 
     def equallogic_backend?
-      self.driver_backend == DriverBackend::EQUALLOGIC
+      self.backend_eqlx == "true"
     end
 
+    def multiple_backends?
+      (equallogic_backend? and self.eqlxs.length > 1) or
+        BACKEND_TYPE_PARAMS.select { |type| send(type.to_s) == "true" }.length > 1
+    end
 
     # view should use this rather than DriverBackend::LABELS to hide LVM for HA.
     def backend_labels_for_layout
@@ -173,16 +110,22 @@ module Staypuft
     end
 
     def param_hash
-      { "driver_backend" => driver_backend, "nfs_uri" => nfs_uri,
-        "rbd_secret_uuid" => rbd_secret_uuid,
-        "san_ip" => san_ip, "san_login" => san_login, "san_password" => san_password,
-        "eqlx_group_name" => eqlx_group_name, "eqlx_pool" => eqlx_pool }
+      { "backend_lvm" => backend_lvm, "backend_ceph" => backend_ceph,
+        "backend_nfs" => backend_nfs, "backend_eqlx" => backend_eqlx,
+        "nfs_uri" => nfs_uri, "rbd_secret_uuid" => rbd_secret_uuid,
+        "eqlxs" => self.eqlxs }
     end
 
     def lvm_ptable
       Ptable.find_by_name('LVM with cinder-volumes')
     end
 
+    %w{san_ip san_login san_password group_name pool}.each do |name|
+      define_method "compute_eqlx_#{name}s" do
+        self.eqlxs.collect { |e| e.send name }
+      end
+    end
+
     private
 
     def set_lvm_ptable
@@ -199,5 +142,21 @@ module Staypuft
         hostgroup.save!
       end
     end
+
+    def at_least_one_backend_selected
+      params = BACKEND_TYPE_PARAMS.clone
+      if self.deployment.ha?
+        params.delete :backend_lvm
+      end
+      unless params.detect(lambda { false }) { |field| field }
+        errors[:base] << _("At least one storage backend must be selected")
+      end
+    end
+
+    def equallogic_backends
+      unless self.eqlxs.all? { |item| item.valid? }
+        errors[:base] << _("Please fix the problems in selected backends")
+      end
+    end
   end
 end

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

@@ -5,12 +5,9 @@ module Staypuft
     end
 
     SEGMENTATION_LIST = ['vxlan', 'vlan', 'gre', 'flat']
-    INTERFACE_HELP    = N_('(e.g. eth0 or em1)')
     VLAN_HELP         = N_('[1-4094] (e.g. 10:15)')
 
-
-    param_attr :network_segmentation, :tenant_vlan_ranges, :networker_tenant_interface,
-               :use_external_interface, :external_interface_name, :compute_tenant_interface
+    param_attr :network_segmentation, :tenant_vlan_ranges
 
     module NetworkSegmentation
       VXLAN  = 'vxlan'
@@ -41,129 +38,69 @@ module Staypuft
               :if                  => :vlan_segmentation?,
               :neutron_vlan_ranges => true
 
-    module NetworkerTenantInterface
-      HUMAN       = N_('Which interface to use for tenant networks')
-      HUMAN_AFTER = INTERFACE_HELP
-    end
-
-    validates :networker_tenant_interface,
-              :presence => true
-    # TODO: interface name format validation
-
-    module UseExternalInterface
-      HUMAN = N_('Configure external interface on network node')
-    end
-
-    validates :use_external_interface, inclusion: { in: [true, false, 'true', 'false'] }
-
-    module ExternalInterfaceName
-      HUMAN       = N_('External interface connected to')
-      HUMAN_AFTER = INTERFACE_HELP
-    end
-
-    validates :external_interface_name,
-              :presence => true,
-              :if       => :use_external_interface?
-    # TODO: interface name format validation
-
-    module ComputeTenantInterface
-      HUMAN       = N_('Which interface to use for tenant networks')
-      HUMAN_AFTER = INTERFACE_HELP
-    end
-
-    validates :compute_tenant_interface,
-              :presence => true
-    # TODO: interface name format validation
-
     class Jail < Safemode::Jail
       allow :networker_vlan_ranges, :compute_vlan_ranges, :network_segmentation, :enable_tunneling?,
-        :networker_tenant_iface, :networker_ovs_bridge_mappings, :networker_ovs_bridge_uplinks,
-        :compute_tenant_iface, :compute_ovs_bridge_mappings, :compute_ovs_bridge_uplinks
+        :tenant_iface, :networker_ovs_bridge_mappings, :networker_ovs_bridge_uplinks,
+        :compute_ovs_bridge_mappings, :compute_ovs_bridge_uplinks
     end
 
     def set_defaults
       self.network_segmentation   = NetworkSegmentation::VXLAN
-      self.use_external_interface = 'false'
     end
 
     def active?
       deployment.networking == Deployment::Networking::NEUTRON
     end
 
-    # TODO: make this less clumsy w/ consistent handling of true/false values
-    def use_external_interface?
-      (self.use_external_interface == true) || (self.use_external_interface == 'true')
-    end
-
     # return list of supported segmentation options with selected option at the
     # beginning of the list
     def network_segmentation_list
-      [self.network_segmentation, *(SEGMENTATION_LIST - [self.network_segmentation])]
+      [network_segmentation, *(SEGMENTATION_LIST - [network_segmentation])]
     end
 
-    def networker_ovs_bridge_mappings
-      [("physnet-tenants:br-#{self.networker_tenant_iface}"  unless self.enable_tunneling?),
-       ('physnet-external:br-ex' if self.use_external_interface?)].compact
+    def networker_ovs_bridge_mappings(host)
+      compute_ovs_bridge_mappings(host) + [*('physnet-external:br-ex' if external_interface_name(host))]
     end
 
-    def networker_ovs_bridge_uplinks
-      [("br-#{self.networker_tenant_iface}:#{self.networker_tenant_iface}" unless self.enable_tunneling?),
-       ("br-ex:#{self.external_interface_name.downcase}" if self.use_external_interface?)
-      ].compact
+    def networker_ovs_bridge_uplinks(host)
+      compute_ovs_bridge_uplinks(host) + [*("br-ex:#{external_interface_name(host)}" if external_interface_name(host))]
     end
 
-    def compute_ovs_bridge_mappings
-      if !self.enable_tunneling?
-        ["physnet-tenants:br-#{self.compute_tenant_iface}"]
-      else
-        []
-      end
+    def compute_ovs_bridge_mappings(host)
+      [*("physnet-tenants:br-#{tenant_iface(host)}" if !enable_tunneling?)]
     end
 
-    def compute_ovs_bridge_uplinks
-      if !self.enable_tunneling?
-        ["br-#{self.compute_tenant_iface}:#{self.compute_tenant_iface}"]
-      else
-        []
-      end
+    def compute_ovs_bridge_uplinks(host)
+      [*("br-#{tenant_iface(host)}:#{tenant_iface(host)}" if !enable_tunneling?)]
     end
 
     def compute_vlan_ranges
-      if self.vlan_segmentation?
-        ["physnet-tenants:#{self.tenant_vlan_ranges}"]
-      else
-        []
-      end
+      [*("physnet-tenants:#{tenant_vlan_ranges}" if vlan_segmentation?)]
     end
 
     def networker_vlan_ranges
-      [("physnet-tenants:#{self.tenant_vlan_ranges}" if self.vlan_segmentation?),
-       "physnet-external"].compact
+      compute_vlan_ranges << "physnet-external"
     end
 
     def vlan_segmentation?
-      self.network_segmentation == NetworkSegmentation::VLAN
+      network_segmentation == NetworkSegmentation::VLAN
     end
 
     def enable_tunneling?
       [NetworkSegmentation::VXLAN, NetworkSegmentation::GRE].include?(network_segmentation)
     end
 
-    def networker_tenant_iface
-      networker_tenant_interface.downcase unless networker_tenant_interface.nil?
+    def tenant_iface(host)
+      deployment.network_query.interface_for_host(host, Staypuft::SubnetType::TENANT)
     end
 
-    def compute_tenant_iface
-      compute_tenant_interface.downcase unless compute_tenant_interface.nil?
+    def external_interface_name(host)
+      deployment.network_query.interface_for_host(host, Staypuft::SubnetType::EXTERNAL)
     end
 
     def param_hash
       { 'network_segmentation'       => network_segmentation,
-        'tenant_vlan_ranges'         => tenant_vlan_ranges,
-        'networker_tenant_interface' => networker_tenant_interface,
-        'use_external_interface'     => use_external_interface,
-        'external_interface_name'    => external_interface_name,
-        'compute_tenant_interface'   => compute_tenant_interface }
+        'tenant_vlan_ranges'         => tenant_vlan_ranges }
     end
 
   end

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

@@ -4,11 +4,9 @@ module Staypuft
       'nova'
     end
 
-    INTERFACE_HELP    = Deployment::NeutronService::INTERFACE_HELP
     VLAN_HELP         = Deployment::NeutronService::VLAN_HELP
 
-    param_attr :network_manager, :vlan_range, :external_interface_name, :public_floating_range,
-               :compute_tenant_interface, :private_fixed_range
+    param_attr :network_manager, :vlan_range, :public_floating_range, :private_fixed_range
 
     class NetworkRangesValidator < ActiveModel::Validator
       def validate(record)
@@ -73,14 +71,6 @@ module Staypuft
               :if              => :vlan_manager?,
               :nova_vlan_range => true
 
-    module ExternalInterfaceName
-      HUMAN       = N_('Which interface to use for external networks')
-      HUMAN_AFTER = INTERFACE_HELP
-    end
-
-    validates :external_interface_name, presence: true
-    # TODO: interface name format validation
-
     module PublicFloatingRange
       HUMAN       = N_('Floating IP range for external network')
       HUMAN_AFTER = N_('(e.g. "10.0.0.0/24")')
@@ -88,15 +78,6 @@ module Staypuft
 
     validates :public_floating_range, presence: true
 
-    module ComputeTenantInterface
-      HUMAN       = N_('Which interface to use for tenant networks')
-      HUMAN_AFTER = INTERFACE_HELP
-    end
-
-    validates :compute_tenant_interface,
-              :presence => true
-    # TODO: interface name format validation
-
     module PrivateFixedRange
       HUMAN       = N_('Fixed IP range for tenant networks')
       HUMAN_AFTER = PublicFloatingRange::HUMAN_AFTER
@@ -138,26 +119,16 @@ module Staypuft
       end
     end
 
-    def private_iface
-      compute_tenant_interface.downcase unless compute_tenant_interface.nil?
-    end
-
-    def public_iface
-      external_interface_name.downcase unless external_interface_name.nil?
-    end
-
     def param_hash
       { 'network_manager'          => network_manager,
         'vlan_range'               => vlan_range,
-        'external_interface_name'  => external_interface_name,
         'public_floating_range'    => public_floating_range,
-        'compute_tenant_interface' => compute_tenant_interface,
         'private_fixed_range'      => private_fixed_range }
     end
 
     class Jail < Safemode::Jail
       allow :network_manager, :network_overrides, :private_fixed_range, :public_floating_range,
-        :private_iface, :public_iface, :num_networks
+        :num_networks
     end
 
   end

data/app/models/staypuft/deployment.rb

@@ -60,9 +60,7 @@ module Staypuft
               [:neutron, :@neutron_service, NeutronService],
               [:glance, :@glance_service, GlanceService],
               [:cinder, :@cinder_service, CinderService],
-              [:passwords, :@passwords, Passwords],
-              [:vips, :@vips, VIPS],
-              [:ips, :@ips, IPS]]
+              [:passwords, :@passwords, Passwords]]
 
     SCOPES.each do |name, ivar, scope_class|
       define_method name do
@@ -197,8 +195,8 @@ module Staypuft
 
     class Jail < Safemode::Jail
       allow :amqp_provider, :networking, :layout_name, :platform, :nova_networking?, :neutron_networking?,
-        :nova, :neutron, :glance, :cinder, :passwords, :vips, :ips, :ha?, :non_ha?,
-        :hide_ceph_notification?
+        :nova, :neutron, :glance, :cinder, :passwords, :ha?, :non_ha?,
+        :hide_ceph_notification?, :network_query
     end
 
     # TODO(mtaylor)
@@ -256,9 +254,9 @@ module Staypuft
 
     def horizon_url
       if ha?
-        "http://#{self.vips.get(:horizon)}"
+        "http://#{network_query.get_vip(:horizon_public_vip)}"
       else
-        self.ips.controller_ips.empty? ? nil : "http://#{self.ips.controller_ip}"
+        network_query.controller_ips(Staypuft::SubnetType::PUBLIC_API).empty? ? nil : "http://#{network_query.controller_ip(Staypuft::SubnetType::PUBLIC_API)}"
       end
     end
 
@@ -280,6 +278,10 @@ module Staypuft
         first
     end
 
+    def network_query
+      @network_query || NetworkQuery.new(self)
+    end
+
     private
 
     def update_layout

data/app/models/staypuft/subnet_type.rb

@@ -23,5 +23,9 @@ module Staypuft
     has_many :subnets, :through => :subnet_typings
 
     scope :required, lambda { where(:is_required => true) }
+
+    class Jail < Safemode::Jail
+      allow :layouts, :layout_subnet_types, :name, :subnets, :subnet_typings, :required
+    end
   end
 end

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

@@ -5,10 +5,9 @@
     <div class="pull-right top_actions">
       <%= render partial: "hosts_filter" %>
       <div class="pull-right">
-
-        <%= submit_tag _("Configure Networks"), :class => "btn btn-default btn-sm dynamic-submit", :disabled => true,
-                     :'data-submit-to' => deployment_interface_assignments_path(@deployment), :'data-method' => 'GET',
-                     :id => "configure_networks_button"%>
+        <button type="button" class= "btn btn-default btn-sm"
+                id="configure_networks_button" data-toggle = "modal"
+                data-target = "#configure_networks_modal" disabled="true"><%= _("Configure Networks") %></button>
         <%= submit_tag _("Unassign Hosts"), :class => "btn btn-primary btn-sm", :disabled => true, :id => "unassign_hosts_button" %>
       </div>
     </div>
@@ -49,6 +48,26 @@
         <% end %>
       </tbody>
     </table>
+    <div class="modal fade" id="configure_networks_modal" tabindex="-1" role="dialog" aria-labelledby="<%= _("Configure Networks") %>" aria-hidden="true" data-path="<%= deployment_interface_assignments_path(@deployment.id) %>">
+          <div class="modal-dialog modal-lg">
+            <div class="modal-content">
+              <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+                <h2 class="modal-title" id="configure_networks_modal_label">
+                  <span class="glyphicon glyphicon-link">
+                  </span> <%= _("Configure Networks") %>
+                </h2>
+              </div>
+              <div class="modal-body">
+                <div id="interfaces"><%= image_tag '/assets/spinner.gif', style: "display: block; margin-left: auto; margin-right: auto" %></div>
+              </div>
+              <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal"><%= _("Cancel") %></button>
+                <button type="button" class="btn btn-primarym" data-dismiss="modal"><%= _("Done") %></button>
+              </div>
+            </div>
+          </div>
+        </div>
   <% end %>
 </div>
 <% else %>

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

@@ -13,17 +13,17 @@
           <div class="col-sm-8 col-sm-offset-1">
               <h4><%= @deployment.ha? ? _("VIP list") : _("Controller IPs") %></h4>
               <% if @deployment.ha? %>
-                <% Staypuft::Deployment::VIPS::VIP_NAMES.each do | vip_name | %>
+                <% Staypuft::NetworkQuery::VIP_NAMES.keys.each do | vip_name | %>
                 <div class="row">
                   <label class="col-sm-4 control-label text-muted"><%= "#{vip_name}:" %></label>
                   <div class="col-sm-8">
-                    <p class="form-control-static"><%= @deployment.vips.get(vip_name) %></p>
+                    <p class="form-control-static"><%= @deployment.network_query.get_vip(vip_name) %></p>
                   </div>
                 </div>
                 <% end %>
               <% else %>
-                <% @deployment.ips.controller_ips.each do |ip| %>
-                  <%= ip %>
+                <% @deployment.network_query.controller_ips(Staypuft::SubnetType::MANAGEMENT).each do |ip| %>
+                  <%= ip %> what subnet type here?
                 <% end %>
               <% end %>
           </div>
@@ -60,4 +60,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>

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

@@ -1,6 +1,6 @@
 <% deployed_hosts = @deployment.hosts.select { |h| h.open_stack_deployed? } %>
 <% assigned_hosts = @deployment.hosts.select { |h| !h.open_stack_deployed? } %>
-<% free_hosts = ::Host.where("hostgroup_id IS NULL") %>
+<% free_hosts = ::Host::Base.where("hostgroup_id IS NULL") %>
 
 <% sub_nav = [ {:title => "#{_('Deployed')} (#{deployed_hosts.count})", :target_id => '#deployed-hosts', :class => "inner-nav", :active => true},
                {:title => "#{_('Assigned')} (#{assigned_hosts.count})", :target_id => '#assigned-hosts', :class => "inner-nav"},

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

@@ -38,10 +38,10 @@
              <%= host_label(host) %>
             </td>
             <td class="ellipsis">
-              <%= link_to(host.os.to_label, hosts_path(:search => "os_description = #{host.os.description}")) if host.os %>
+              <%= link_to(host.os.to_label, hosts_path(:search => "os_description = #{host.os.description}")) if host.respond_to?(:os) && host.os %>
             </td>
-            <td><%= host.cpus %></td>
-            <td><%= host.mem %></td>
+            <td><%= host.cpus if host.respond_to?(:cpu) %></td>
+            <td><%= host.mem if host.respond_to?(:mem) %></td>
             <td><%= host_nics(host) %></td>
             <td class="hidden-s hidden-xs"><%= host.ip %></td>
           </tr>
@@ -53,7 +53,7 @@
         <div class="modal-content">
           <div class="modal-header">
             <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-            <h2 class="modal-title" id="deploy_modal_label">
+            <h2 class="modal-title" id="role_modal_label">
               <span class="glyphicon glyphicon-th-list">
               </span> <%= _("Deployment Roles") %>
             </h2>