staypuft 0.1.22 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b4c1705398e46ec5568abc0ab8335dff279719c9
+  data.tar.gz: 3f47eaa170912b118662a4408cc64dc8c284812b
+SHA512:
+  metadata.gz: 0aec5dc5dd3bebcf6b3b71baf37c76698afd99b67b3c3f951532ff98149c54b4858c19a4da61b6de1cf37bc69a004583ba2afba782e78727cd606fdbc24b5253
+  data.tar.gz: faab17c4c5d7271394c7140f2d92538e4c83c2b073e7cf1827c71072ad92822f0ce81262ee642d14b8ac7ca83ac67359dc74679a8a0a602e53c7cf3d582110ec

data/README.md

@@ -33,6 +33,12 @@ remote is github.com/theforeman/staypuft. Now bump the version in lib/staypuft/v
 Finally build and release new gem by running `rake release`. This will build the package,
 tag the commit, push the commit and the tag to origin and uploads the gem to rubygems.org.
 
+To build and RPM we recommend using our specs in [Foreman packaging](https://github.com/theforeman/foreman-packaging).
+You should find the spec in rpm/develop branch. There's also a README.md which explains
+how you should update and build a package. Long story short, you update the gem and spec,
+send and send a PR. Once it's merged you can build in our koji instance (if you have
+access) using tito.
+
 ## Copyright
 
 Copyright (c) 2014 Red Hat, Inc. http://redhat.com

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

@@ -116,8 +116,68 @@ $(function () {
     }
   }
 
+  showCinderEquallogic();
+  $("input[name='staypuft_deployment[cinder][driver_backend]']").change(showCinderEquallogic);
+  function showCinderEquallogic() {
+    if ($('#staypuft_deployment_cinder_driver_backend_equallogic').is(":checked")) {
+      $('.cinder_equallogic').show();
+    }
+    else {
+      $('.cinder_equallogic').hide();
+    }
+  }
+
   if ($('.configuration').length > 0) {
     $('.configuration').find('li').first().find('a')[0].click();
   }
 
+  // add a hash to the URL when the user clicks on a tab
+  $('a[data-toggle="tab"]').on('click', function(e) {
+    if(!$(this).hasClass("sub-tab")){
+      history.pushState(null, null, $(this).attr('href'));
+    }
+  });
+  // navigate to a tab when the history changes
+  window.addEventListener("popstate", function(e) {
+    var activeTab = $('[href=' + location.hash + ']');
+    if (activeTab.length) {
+      activeTab.tab('show');
+    } else {
+      $('.nav-tabs a:first').tab('show');
+    }
+  });
+
+  // Javascript to enable link to tab
+  var hash = document.location.hash;
+  var prefix = "tab_";
+  if (hash) {
+      $('.nav-tabs a[href='+hash.replace(prefix,"")+']').tab('show');
+  }
+
+  // Change hash for page-reload
+  $('.nav-tabs a').on('shown', function (e) {
+      window.location.hash = e.target.hash.replace("#", "#" + prefix);
+  });
+
+  $('#edit_staypuft_deployment_submit').click(function (e) {
+    $('#edit_staypuft_deployment').submit();
+    e.preventDefault();
+  });
+
+
+  $('#deploy_modal').on('shown.bs.modal', function(e) {
+    $('#sub-navigation a[href="#overview"]').tab('show');
+    window.location.hash = "#overview";
+  });
+
+  var scrolled = false;
+
+  $(window).scroll(function(){
+    scrolled = true;
+  });
+
+  if ( window.location.hash && scrolled ) {
+    $(window).scrollTop( 0 );
+  }
+
 });

data/app/assets/stylesheets/staypuft/staypuft.css.scss

@@ -15,6 +15,17 @@
 @import "bootstrap/buttons";
 @import "bootstrap/forms";
 
+ul.inner-nav {
+  border: 0 !important;
+}
+
+li.inner-nav a {
+  border: 0 !important;
+}
+
+li.inner-nav.active a {
+  text-decoration:underline;
+}
 .deployment-wizard .wizard {
   width: 100%;
   float: left;
@@ -27,6 +38,18 @@
   margin-left: 10px;
 }
 
+.deployment-wizard form {
+  min-height: 705px;
+  position: relative;
+  padding-bottom: 60px;
+}
+
+.deployment-wizard .form_actions {
+  position: absolute;
+  bottom: 20px;
+  right: 20px;
+}
+
 .top_actions {
   //same margin as h1 (title)
   margin: 20px 0 10px;

data/app/controllers/staypuft/deployments_controller.rb

@@ -44,7 +44,7 @@ module Staypuft
               end
             end
           end
-          redirect_to summary_deployment_path(params[:id])
+          redirect_to "#{deployment_path(params[:id])}#advanced_configuration"
         end
 
         format.json do

data/app/helpers/staypuft/application_helper.rb

@@ -5,6 +5,17 @@ module Staypuft
       content_for(:subtitle, page_subtitle.to_s)
     end
 
+    def tabbed_nav_menu(menu_items, id=nil, class_name=nil, subclass_name=nil)
+      content_tag(:ul, :class => class_name, :id => id) do
+        menu_items.each do | item |
+          concat(content_tag(:li, link_to(item[:title], "#{item[:target_id]}",
+                                          :class => subclass_name,
+                                          :data => { :id => item[:target_id], :toggle => 'tab'}),
+                                          :class => item[:active] ? "#{item[:class]} active" : item[:class] ))
+        end
+      end
+    end
+
     def radio_button_f_non_inline(f, attr, options = {})
       text  = options.delete(:text)
       value = options.delete(:value)

data/app/lib/staypuft/seeder.rb

@@ -182,8 +182,8 @@ module Staypuft
       ml2_network_vlan_ranges     = ovs_vlan_ranges
       tenant_network_type         = '<%= @host.deployment.neutron.network_segmentation %>'
       ml2_tenant_network_types    = [ tenant_network_type ]
-      ml2_tunnel_id_ranges        = ['10:100000']
-      ml2_vni_ranges              = ['10:100000']
+      ml2_tunnel_id_ranges        = ['10:1000']
+      ml2_vni_ranges              = ['10:1000']
       ovs_tunnel_types            = ['vxlan', 'gre']
       ovs_tunnel_iface            = { :string => '<%= n = @host.deployment.neutron; n.enable_tunneling? ? n.networker_tenant_interface : "" %>' }
       ovs_bridge_mappings         = { :array =>  '<%= @host.deployment.neutron.networker_ovs_bridge_mappings %>' }
@@ -194,13 +194,13 @@ module Staypuft
       enable_tunneling            = { :string => '<%= @host.deployment.neutron.enable_tunneling?.to_s %>' }
 
       # Glance
-      backend                     = 'file'
-      pcmk_fs_type                = { :string => '<%= @host.deployment.glance.driver_backend %>' }
+      backend                     = { :string => '<%= @host.deployment.glance.backend %>' }
+      pcmk_fs_type                = { :string => '<%= @host.deployment.glance.pcmk_fs_type %>' }
       pcmk_fs_device              = { :string => '<%= @host.deployment.glance.pcmk_fs_device %>' }
       pcmk_fs_dir                 = '/var/lib/glance/images'
-      pcmk_fs_manage              = 'true'
+      pcmk_fs_manage              = { :string => '<%= @host.deployment.glance.pcmk_fs_manage %>' }
       pcmk_fs_options             = { :string => '<%= @host.deployment.glance.pcmk_fs_options %>' }
-      glance_rbd_store_user       = 'glance'
+      glance_rbd_store_user       = 'images'
       glance_rbd_store_pool       = 'images' 
 
       # Cinder
@@ -213,31 +213,31 @@ module Staypuft
       cinder_backend_nfs_name     = 'nfs_backend'
       cinder_multiple_backends    = false
       cinder_nfs_shares           = ['<%= @host.deployment.cinder.nfs_uri %>']
-      cinder_nfs_mount_options    = ''
+      cinder_nfs_mount_options    = 'nosharecache'
 
       cinder_backend_rbd                      = { :string => '<%= @host.deployment.cinder.ceph_backend? %>' }
       cinder_backend_rbd_name                 = 'rbd_backend'
-      # TODO: confirm these params and add them to model where user input is needed
       cinder_rbd_pool                         = 'volumes'
-      cinder_rbd_ceph_conf                    = '/etc/ceph/ceph.conf/'
+      cinder_rbd_ceph_conf                    = '/etc/ceph/ceph.conf'
       cinder_rbd_flatten_volume_from_snapshot = 'false'
       cinder_rbd_max_clone_depth              = '5'
-      cinder_rbd_user                         = 'cinder'
-      cinder_rbd_secret_uuid                  = ''
+      cinder_rbd_user                         = 'volumes'
+      cinder_rbd_secret_uuid                  = { :string => '<%= @host.deployment.cinder.rbd_secret_uuid %>' }
 
       cinder_backend_eqlx           = { :string => '<%= @host.deployment.cinder.equallogic_backend? %>' }
       cinder_backend_eqlx_name      = ['eqlx_backend']
       # TODO: confirm these params and add them to model where user input is needed
       # below dynamic calls are commented out since the model does not yet have san/chap entries
-      cinder_san_ip                 = [''] # ['<%= #@host.deployment.cinder.san_ip %>']
-      cinder_san_login              = [''] # ['<%= #@host.deployment.cinder.san_login %>']
-      cinder_san_password           = [''] # ['<%= #@host.deployment.cinder.san_password %>']
+      cinder_san_ip                 = ['<%= @host.deployment.cinder.san_ip %>']
+      cinder_san_login              = ['<%= @host.deployment.cinder.san_login %>']
+      cinder_san_password           = ['<%= @host.deployment.cinder.san_password %>']
+      cinder_eqlx_group_name        = ['<%= @host.deployment.cinder.eqlx_group_name %>']
+      cinder_eqlx_pool              = ['<%= @host.deployment.cinder.eqlx_pool %>']
+
       cinder_san_thin_provision     = ['false']
-      cinder_eqlx_group_name        = ['group-0']
-      cinder_eqlx_pool              = ['default']
       cinder_eqlx_use_chap          = ['false']
-      cinder_eqlx_chap_login        = [''] # ['<%= #@host.deployment.cinder.chap_login %>']
-      cinder_eqlx_chap_password     = [''] # ['<%= #@host.deployment.cinder.chap_password %>']
+      cinder_eqlx_chap_login        = ['']
+      cinder_eqlx_chap_password     = ['']
 
 
       # effective_value grabs shared password if deployment is in shared password mode,
@@ -560,6 +560,8 @@ module Staypuft
               'ceilometer'                 => ceilometer,
               'cinder_backend_gluster'     => cinder_backend_gluster,
               'cinder_backend_nfs'         => cinder_backend_nfs,
+              'cinder_backend_rbd'         => cinder_backend_rbd,
+              'rbd_secret_uuid'            => cinder_rbd_secret_uuid,
               'network_manager'            => network_manager,
               'network_overrides'          => network_overrides,
               'network_num_networks'       => network_num_networks,
@@ -585,6 +587,8 @@ module Staypuft
               'ceilometer'                 => ceilometer,
               'cinder_backend_gluster'     => cinder_backend_gluster,
               'cinder_backend_nfs'         => cinder_backend_nfs,
+              'cinder_backend_rbd'         => cinder_backend_rbd,
+              'rbd_secret_uuid'            => cinder_rbd_secret_uuid,
               'enable_tunneling'           => enable_tunneling,
               'tenant_network_type'        => tenant_network_type,
               'ovs_bridge_mappings'        => compute_ovs_bridge_mappings,

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

@@ -0,0 +1,39 @@
+module Staypuft
+  module Concerns
+    module HostDetailsHelper
+      extend ActiveSupport::Concern
+
+      # Returns memory in GB
+      def mem
+        if self.facts_hash["memorytotal"]
+          self.facts_hash["memorytotal"].split(" ").first.to_f / 1000
+        else
+          nil
+        end
+      end
+
+      # Returns total number of processes
+      def cpus
+        self.facts_hash["processorcount"]
+      end
+
+      # Returns array of NIC names
+      def network_interfaces
+        if self.facts_hash["interfaces"]
+          self.facts_hash["interfaces"].split(",")
+        else
+          nil
+        end
+      end
+
+      # Returns architecture
+      def architectures
+        if self.facts_hash["architecture"]
+          self.facts_hash["architecture"].name
+        else
+          nil
+        end
+      end
+    end
+  end
+end

data/app/models/staypuft/deployment.rb

@@ -94,10 +94,15 @@ module Staypuft
 
     # Helper method for looking up a Deployment based on a foreman task
     def self.find_by_foreman_task(foreman_task)
-      Deployment.find(ForemanTasks::Lock.where(task_id: foreman_task.id,
-                                               name: :deploy,
-                                               resource_type: 'Staypuft::Deployment')
-                                               .first.resource_id)
+      task = ForemanTasks::Lock.where(task_id: foreman_task.id,
+                                                     name: :deploy,
+                                                     resource_type: 'Staypuft::Deployment').first
+      unless task.nil?
+        Deployment.find(task.resource_id)
+      else
+        nil
+      end
+
     end
 
     # Returns a list of hosts that are currently being deployed.

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

@@ -1,12 +1,40 @@
+# encoding: utf-8
 module Staypuft
   class Deployment::CinderService < Deployment::AbstractParamScope
     def self.param_scope
       'cinder'
     end
 
-    param_attr :driver_backend, :nfs_uri
+    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
 
+    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
+
     module DriverBackend
       LVM        = 'lvm'
       NFS        = 'nfs'
@@ -30,17 +58,84 @@ module Staypuft
               :if       => :nfs_backend?
     # TODO: uri validation
 
-    # TODO: add ceph UI parameters
+    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?
 
-    # TODO: add EqualLogic UI parameters
+    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?
 
     class Jail < Safemode::Jail
-      allow :lvm_backend?, :nfs_backend?, :nfs_uri, :ceph_backend?, :equallogic_backend?
+      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
     end
 
     def set_defaults
-      self.driver_backend = DriverBackend::LVM
+      self.driver_backend  = DriverBackend::LVM
+      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
@@ -66,30 +161,22 @@ module Staypuft
 
 
     # view should use this rather than DriverBackend::LABELS to hide LVM for HA.
-    # TODO: Add back CEPH and EQUALLOGIC as they're suppoirted
     def backend_labels_for_layout
       ret_list = DriverBackend::LABELS.clone
       ret_list.delete(DriverBackend::LVM) if self.deployment.ha?
-      # TODO: remove this line when Ceph is supported
-      ret_list.delete(DriverBackend::CEPH)
-      # TODO: remove this line when EqualLogic is supported
-      ret_list.delete(DriverBackend::EQUALLOGIC)
-
       ret_list
     end
     def backend_types_for_layout
       ret_list = DriverBackend::TYPES.clone
       ret_list.delete(DriverBackend::LVM) if self.deployment.ha?
-      # TODO: remove this line when Ceph is supported
-      ret_list.delete(DriverBackend::CEPH)
-      # TODO: remove this line when EqualLogic is supported
-      ret_list.delete(DriverBackend::EQUALLOGIC)
-
       ret_list
     end
 
     def param_hash
-      { "driver_backend" => driver_backend, "nfs_uri" => nfs_uri}
+      { "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 }
     end
 
     def lvm_ptable