staypuft 0.5.0 → 0.5.1

data/app/models/staypuft/deployment.rb

@@ -12,11 +12,11 @@ module Staypuft
     NEW_NAME_PREFIX = 'uninitialized_'
 
     # supporting import/export
-    EXPORT_PARAMS   = [:amqp_provider, :networking, :layout_name, :platform]
+    EXPORT_PARAMS   = [:amqp_provider, :networking, :platform]
     EXPORT_SERVICES = [:nova, :neutron, :glance, :cinder, :passwords, :ceph]
 
     attr_accessible :description, :name, :layout_id, :layout,
-                    :amqp_provider, :layout_name, :networking, :platform,
+                    :amqp_provider, :networking, :platform,
                     :custom_repos
     after_save :update_hostgroup_name
     after_validation :check_form_complete
@@ -83,7 +83,6 @@ module Staypuft
 
     def initialize(attributes = {}, options = {})
       super({ amqp_provider: AmqpProvider::RABBITMQ,
-              layout_name:   LayoutName::NON_HA,
               networking:    Networking::NEUTRON,
               platform:      Platform::RHEL7 }.merge(attributes),
             options)
@@ -96,8 +95,7 @@ module Staypuft
       self.cinder.set_defaults
       self.passwords.set_defaults
       self.ceph.set_defaults
-      self.layout = Layout.where(:name       => self.layout_name,
-                                 :networking => self.networking).first
+      self.layout = Layout.where(:networking => self.networking).first
     end
 
     extend AttributeParamStorage
@@ -176,15 +174,6 @@ module Staypuft
       HUMAN   = N_('Networking')
     end
 
-    module LayoutName
-      NON_HA = 'Controller / Compute'
-      HA     = 'High Availability Controllers / Compute'
-      LABELS = { NON_HA => N_('Controller / Compute'),
-                 HA     => N_('High Availability Controllers / Compute') }
-      TYPES  = LABELS.keys
-      HUMAN  = N_('High Availability')
-    end
-
     module Platform
       RHEL7  = 'rhel7'
       RHEL6  = 'rhel6'
@@ -193,15 +182,14 @@ module Staypuft
       HUMAN  = N_('Platform')
     end
 
-    param_attr :amqp_provider, :networking, :layout_name, :platform
+    param_attr :amqp_provider, :networking, :platform
     validates :amqp_provider, :presence => true, :inclusion => { :in => AmqpProvider::TYPES }
     validates :networking, :presence => true, :inclusion => { :in => Networking::TYPES }
-    validates :layout_name, presence: true, inclusion: { in: LayoutName::TYPES }
     validates :platform, presence: true, inclusion: { in: Platform::TYPES }
 
     class Jail < Safemode::Jail
-      allow :amqp_provider, :networking, :layout_name, :platform, :nova_networking?, :neutron_networking?,
-        :nova, :neutron, :glance, :cinder, :passwords, :ceph, :ha?, :non_ha?,
+      allow :amqp_provider, :networking, :platform, :nova_networking?, :neutron_networking?,
+        :nova, :neutron, :glance, :cinder, :passwords, :ceph,
         :hide_ceph_notification?, :network_query, :has_custom_repos?, :custom_repos_paths
     end
 
@@ -242,14 +230,6 @@ module Staypuft
       self.form_step.to_sym == Deployment::STEP_COMPLETE
     end
 
-    def ha?
-      self.layout_name == LayoutName::HA
-    end
-
-    def non_ha?
-      self.layout_name == LayoutName::NON_HA
-    end
-
     def nova_networking?
       networking == Networking::NOVA
     end
@@ -259,11 +239,7 @@ module Staypuft
     end
 
     def horizon_url
-      if ha?
-        "http://#{network_query.get_vip(:horizon_public_vip)}"
-      else
-        network_query.controller_ips(Staypuft::SubnetType::PUBLIC_API).empty? ? nil : "http://#{network_query.controller_ip(Staypuft::SubnetType::PUBLIC_API)}"
-      end
+      "http://#{network_query.get_vip(:horizon_public_vip)}"
     end
 
     def controller_hostgroup
@@ -336,7 +312,7 @@ module Staypuft
     private
 
     def update_layout
-      self.layout = Layout.where(:name => layout_name, :networking => networking).first
+      self.layout = Layout.where(:networking => networking).first
     end
 
     def update_based_on_settings

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

@@ -62,8 +62,7 @@ module Staypuft
         :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_thin_provision,
-        :compute_eqlx_use_chap, :compute_eqlx_chap_logins, :compute_eqlx_chap_passwords,
-        :compute_eqlx_backend_names
+        :compute_eqlx_use_chap, :compute_eqlx_chap_logins, :compute_eqlx_chap_passwords
     end
 
     def set_defaults
@@ -80,7 +79,7 @@ module Staypuft
     end
 
     def lvm_backend?
-      !self.deployment.ha? && self.backend_lvm == "true"
+      self.backend_lvm == "true"
     end
 
     def nfs_backend?
@@ -100,16 +99,11 @@ module Staypuft
         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
-      ret_list = DriverBackend::LABELS.clone
-      ret_list.delete(DriverBackend::LVM) if self.deployment.ha?
-      ret_list
+      DriverBackend::LABELS
     end
     def backend_types_for_layout
-      ret_list = DriverBackend::TYPES.clone
-      ret_list.delete(DriverBackend::LVM) if self.deployment.ha?
-      ret_list
+      DriverBackend::TYPES
     end
 
     def param_hash
@@ -135,10 +129,6 @@ module Staypuft
       end
     end
 
-    def compute_eqlx_backend_names
-      self.eqlxs.collect.with_index { |e,i| "eqlx#{i+1}" }
-    end
-
     private
 
     def set_lvm_ptable
@@ -157,9 +147,7 @@ module Staypuft
     end
 
     def at_least_one_backend_selected
-      params = BACKEND_TYPE_PARAMS.clone
-      params.delete :backend_lvm if self.deployment.ha?
-      unless params.detect(lambda { false }) { |field| self.send(field) == "true" }
+      unless BACKEND_TYPE_PARAMS.detect(lambda { false }) { |field| self.send(field) == "true" }
         errors.add :base, _("At least one storage backend must be selected")
       end
     end

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

@@ -87,19 +87,12 @@ module Staypuft
       backend == BACKEND_FILE
     end
 
-    # view should use this rather than DriverBackend::LABELS to hide LOCAL for HA.
     def backend_labels_for_layout
-      ret_list = DriverBackend::LABELS.clone
-      ret_list.delete(DriverBackend::LOCAL) if self.deployment.ha?
-      ret_list.delete(DriverBackend::NFS)   if self.deployment.non_ha?
-      ret_list
+      DriverBackend::LABELS
     end
 
     def backend_types_for_layout
-      ret_list = DriverBackend::TYPES.clone
-      ret_list.delete(DriverBackend::LOCAL) if self.deployment.ha?
-      ret_list.delete(DriverBackend::NFS)   if self.deployment.non_ha?
-      ret_list
+      DriverBackend::TYPES
     end
 
     def param_hash

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

@@ -9,7 +9,7 @@ module Staypuft
     ML2MECHANISM_TYPES  = :ml2_openvswitch, :ml2_l2population, :ml2_cisco_nexus
     N1KV_PARAMS         = :n1kv_vsm_ip, :n1kv_vsm_password
 
-    param_attr :network_segmentation, :tenant_vlan_ranges, :core_plugin,
+    param_attr :network_segmentation, :tenant_vlan_ranges, :core_plugin, :network_device_mtu,
                *ML2MECHANISM_TYPES, *N1KV_PARAMS
     param_attr_array :nexuses => Cisconexus
 
@@ -85,6 +85,13 @@ module Staypuft
               :presence   => true,
               :if         => [:ml2_plugin?, :cisco_nexus_mechanism?]
 
+    module Mtu
+      HUMAN           = N_('Tenant Network Device MTU')
+      HUMAN_AFTER     = N_('(Optional) Only set this if changing the default')
+    end
+
+    validates :network_device_mtu, numericality: { only_integer: true }, allow_blank: true
+
     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,
@@ -92,7 +99,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
+        :core_plugin_module, :network_device_mtu
     end
 
     def set_defaults
@@ -101,6 +108,7 @@ module Staypuft
       self.ml2_openvswitch = "true"
       self.ml2_l2population = "true"
       self.ml2_cisco_nexus = "false"
+      self.network_device_mtu = nil
     end
 
     def active?

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

@@ -6,7 +6,8 @@ module Staypuft
 
     VLAN_HELP         = Deployment::NeutronService::VLAN_HELP
 
-    param_attr :network_manager, :vlan_range, :public_floating_range, :private_fixed_range
+    param_attr :network_manager, :vlan_range, :public_floating_range, :private_fixed_range,
+               :network_device_mtu
 
     class NetworkRangesValidator < ActiveModel::Validator
       def validate(record)
@@ -90,8 +91,16 @@ module Staypuft
 
     validates :private_fixed_range, presence: true
 
+    module Mtu
+      HUMAN       = Staypuft::Deployment::NeutronService::Mtu::HUMAN
+      HUMAN_AFTER = Staypuft::Deployment::NeutronService::Mtu::HUMAN_AFTER
+    end
+
+    validates :network_device_mtu, numericality: { only_integer: true }, allow_blank: true
+
     def set_defaults
       self.network_manager = NetworkManager::FLAT_DHCP
+      self.network_device_mtu = nil
     end
 
     def active?
@@ -164,7 +173,7 @@ module Staypuft
 
     class Jail < Safemode::Jail
       allow :network_manager, :network_overrides, :private_fixed_range, :public_floating_range,
-        :num_networks, :network_size
+        :num_networks, :network_size, :network_device_mtu
     end
 
   end

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

@@ -2,10 +2,10 @@ module Staypuft
   class Deployment::Passwords < Deployment::AbstractParamScope
 
     USER_SERVICES_PASSWORDS = :admin, :ceilometer_user, :cinder_user, :glance_user, :heat_user,
-        :heat_cfn_user, :keystone_user, :neutron_user, :nova_user, :swift_user, :swift_admin, :amqp
+        :heat_cfn_user, :keystone_user, :neutron_user, :nova_user, :swift_user, :amqp
 
     DB_SERVICES_PASSWORDS = :cinder_db, :glance_db, :heat_db, :mysql_root, :keystone_db,
-        :neutron_db, :nova_db, :amqp_nssdb
+        :neutron_db, :nova_db
 
     OTHER_PASSWORDS = :keystone_admin_token, :ceilometer_metering_secret, :heat_auth_encrypt_key,
         :horizon_secret_key, :swift_shared_secret, :neutron_metadata_proxy_secret

data/app/models/staypuft/service.rb

@@ -14,26 +14,7 @@ module Staypuft
     def ui_params_for_form(hostgroup)
       return [] if (hostgroup.nil?)
       role = hostgroup.role
-      if hostgroup.puppetclasses.blank?
-        params_from_hash = []
-      else
-        puppetclass      = hostgroup.puppetclasses.first
-        params_from_hash = UI_PARAMS.fetch(self.name, []).collect do |param_key|
-          if param_key.is_a?(Array)
-            param_name        = param_key[0]
-            param_puppetclass = Puppetclass.find_by_name(param_key[1])
-          else
-            param_name        = param_key
-            param_puppetclass = puppetclass
-          end
-          param_lookup_key = param_puppetclass.class_params.where(:key => param_key).first
-          param_lookup_key.nil? ? nil : { :hostgroup   => hostgroup,
-                                          :role        => role,
-                                          :puppetclass => param_puppetclass,
-                                          :param_key   => param_lookup_key }
-        end.compact
-      end
-      params_from_service = self.puppetclasses.collect do |pclass|
+      self.puppetclasses.collect do |pclass|
         pclass.class_params.collect do |class_param|
           { :hostgroup => hostgroup,
             :role => role,
@@ -41,7 +22,6 @@ module Staypuft
             :param_key => class_param }
         end
       end.flatten
-      params_from_hash + params_from_service
     end
   end
 end

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

@@ -11,25 +11,14 @@
       <div class="modal-body" style="max-height: 600px; overflow: auto;">
         <div class="row">
           <div class="col-sm-12">
-              <h4><%= @deployment.ha? ? _("VIP list") : _("Controller IPs") %></h4>
-              <% if @deployment.ha? %>
-                <% 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.network_query.get_vip(vip_name) %></p>
-                  </div>
-                </div>
-                <% end %>
-              <% else %>
-                <% [Staypuft::SubnetType::PUBLIC_API, Staypuft::SubnetType::MANAGEMENT, Staypuft::SubnetType::ADMIN_API].each do |subnet_type| %>
-                <div class="row">
-                  <label class="col-sm-4 control-label text-muted"><%= "#{subnet_type}:" %></label>
-                  <div class="col-sm-8">
-                    <p class="form-control-static"><%= @deployment.network_query.controller_ips(subnet_type).first %></p>
-                  </div>
+              <h4><%=  _("VIP list") %></h4>
+              <% 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.network_query.get_vip(vip_name) %></p>
                 </div>
-                <% end %>
+              </div>
               <% end %>
           </div>
         </div>

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

@@ -4,7 +4,7 @@
 
 <% 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"},
-               {:title => "#{_('Free')} (#{free_hosts.count})", :target_id => '#free-hosts', :class => "inner-nav"} ] %>
+               {:title => "#{_('Unassigned')} (#{free_hosts.count})", :target_id => '#free-hosts', :class => "inner-nav"} ] %>
 
 <%= tabbed_nav_menu(sub_nav, 'hosts-navigation', 'nav nav-tabs inner-nav', 'sub-tab') %>
 

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

@@ -1,10 +1,7 @@
 <% title(@deployment.name,
          edit_textfield(@deployment,
                         :name,
-                        options={ :update_url => deployment_path(@deployment) }) +
-             content_tag(:small,
-                         @deployment.ha? ? _("with High Availability") : _("without High Availability"),
-                         :class => "text-muted")) %>
+                        options={ :update_url => deployment_path(@deployment) }) ) %>
 
 <% content_for(:top_actions) do %>
   <%= link_to(_("Deploy"),

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

@@ -1,5 +1,5 @@
 <% if hosts.exists? %>
-<h4 class="pull-left"><%= _("Free Hosts") %></h4>
+<h4 class="pull-left"><%= _("Unassigned Hosts") %></h4>
 <div class="" id="table_free_hosts">
   <%= form_tag(associate_host_deployment_path(id: @deployment), class: 'form-horizontal association') do |f| %>
     <div class="pull-right top_actions">
@@ -44,7 +44,7 @@
 </div>
 <% else %>
   <div class="association">
-    <h4><%= _("Free Hosts") %></h4>
+    <h4><%= _("Unassigned Hosts") %></h4>
     <div class="alert alert-warning">
       <span class="glyphicon glyphicon-warning-sign">&nbsp;</span>
       <%= _("All available hosts have been already assigned.") %>

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

@@ -2,7 +2,7 @@
   <% if hosts.present? %>
     <%= form_tag(associate_host_deployment_path(id: deployment), class: 'form-horizontal well association') do |f| %>
 
-      <%= render 'hosts_header', :header => _("Free Hosts"), :child_hostgroup => child_hostgroup, :assign_text => _("Assign Hosts") %>
+      <%= render 'hosts_header', :header => _("Unassigned Hosts"), :child_hostgroup => child_hostgroup, :assign_text => _("Assign Hosts") %>
 
       <table class="table table-bordered table-striped table-condensed">
         <thead>
@@ -19,6 +19,6 @@
 
     <% end %>
   <% else %>
-    <%= render 'empty_hosts', :header => _("Free Hosts"), :message => _("All available hosts have been already assigned.") %>
+    <%= render 'empty_hosts', :header => _("Unassigned Hosts"), :message => _("All available hosts have been already assigned.") %>
   <% end %>
 </div>

data/app/views/staypuft/interface_assignments/_nics_assignment_overview.html.erb

@@ -0,0 +1,40 @@
+<div class="row">
+  <div class="col-md-12">
+    <h3 data-toggle="collapse" data-target="#hosts_to_configure"><%= @hosts.count %> <%= "#{n_('Host', 'Hosts', @hosts.count)} #{_('to be configured')}" %> <span class="small glyphicon glyphicon-chevron-down"></span></h3>
+    <div id="hosts_to_configure" class="collapse">
+      <table class="table table-striped table-condensed">
+        <thead>
+          <tr>
+            <th><%= sort :name, :as => _('Host Name') %></th>
+            <th><%= @host.primary_interface %></th>
+            <% @interfaces.each do |interface| %>
+              <th><%= interface.identifier %></th>
+            <% end %>
+          </tr>
+        </thead>
+        <tbody>
+          <% @hosts.each do |host| %>
+            <tr>
+              <td class="ellipsis">
+               <%= host_label(host) %>
+              </td>
+              <td>
+                <%= host.mac %><br/>
+                <%= host.ip %>
+              </td>
+              <% if host.interfaces.present? %>
+                <% @interfaces.each do |iface| %>
+                  <% interface = host.interfaces.where(identifier: iface.identifier).first %>
+                  <td>
+                    <%= interface.mac %><br/>
+                    <%= interface.ip %>
+                  </td>
+                <% end %>
+              <% end %>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>

data/app/views/staypuft/interface_assignments/index.html.erb

@@ -5,46 +5,12 @@
 
 <% title _("Configure Interfaces (%s hosts)") % @hosts.size %>
 
-<div class="row">
-  <div class="col-md-12">
-    <h3 data-toggle="collapse" data-target="#hosts_to_configure"><%= @hosts.count %> <%= "#{n_('Host', 'Hosts', @hosts.count)} #{_('to be configured')}" %> <span class="small glyphicon glyphicon-chevron-down"></span></h3>
-    <div id="hosts_to_configure" class="collapse">
-      <table class="table table-striped table-condensed">
-        <thead>
-          <tr>
-            <th><%= sort :name, :as => _('Host Name') %></th>
-            <th><%= @host.primary_interface %></th>
-            <% @interfaces.each do |interface| %>
-              <th><%= interface.identifier %></th>
-            <% end %>
-          </tr>
-        </thead>
-        <tbody>
-          <% @hosts.each do |host| %>
-            <tr>
-              <td class="ellipsis">
-               <%= host_label(host) %>
-              </td>
-              <td>
-                <%= host.mac %><br/>
-                <%= host.ip %>
-              </td>
-              <% if host.interfaces.present? %>
-                <td>
-                  <% host.interfaces.each do |interface| %>
-                    <%= interface.mac %><br/>
-                    <%= interface.ip %>
-                  <% end %>
-                </td>
-              <% end %>
-            </tr>
-          <% end %>
-        </tbody>
-      </table>
-    </div>
-  </div>
+<div id="nics_assignment_overview">
+  <%= render 'staypuft/interface_assignments/nics_assignment_overview',
+           :host => @host,
+           :hosts => @hosts,
+           :interfaces => @interfaces %>
 </div>
-
 <div id="nics_assignment">
   <%= render 'staypuft/interface_assignments/nics_assignment',
            :host => @host,