staypuft 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: a03caebb78c982156156e14071fb90cef35627dd
-  data.tar.gz: 96d1b6b7f38b74f6b081d1e061b7a9d7e5dbab89
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDI4ZGUzMDk5ZjA2ZDgyODNkYTFjMzgxNGI3MzhmNDhkOGZmM2ZhMA==
+  data.tar.gz: !binary |-
+    OWYwYTdhNDhkYmZjMGVjNmUzMmM5YjM5NWViNDkxNDNkMDA1OWM1Mw==
 SHA512:
-  metadata.gz: 213f86077425ac3969d84c220fce82fe6bc941234ea136e8332d594c9bc93c58e440ba919c7be841ae2e4848c598eb4c9c00cd64076471440331ad6d0fed392f
-  data.tar.gz: 114c5a5a5ad09fc049bb8c6504265a8da3a05717acfb6b7fe232b83a4c023b491bc10f3c78e16349fc50372dd1732535a6f6bc267fc507e072fca1890979825e
+  metadata.gz: !binary |-
+    OWYyNmY4NThhYzU4NmNiNmY4MTcyOGY3NGE1ZmYzNmE0MTIzYzFjZjU3ZDE3
+    OTM5NTU0Nzk2Yjk1Y2JlMGRkZDkwN2YwNDM4NDJhMjQ4NWI4ZjBlNmU2YzBj
+    MzMwNjVjMDllZGUxMzgwNTIzODdiN2Q1ZDUyYzNlNDRhZGQ5ZGI=
+  data.tar.gz: !binary |-
+    MjY0ZjVkZjVhNjBhYjVhMjkwMzU3NDdlMWJlMWUyNDFjODE0M2VjNWFhMDE4
+    NTU3NGU3YjdkYzRlMDM5YWVhYzEzMjg3ZWU1M2Q3OTdjNmFkYmMwYTQ5OGRm
+    ZjZhN2I1NjNkODRlMTMwNGQ1OWFmMmJjMjg3ZDBmMzljZGRiYjk=

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

@@ -0,0 +1,9 @@
+var new_subnet = (function() {
+  $('#staypuft_simple_subnet_dhcp_server').on('change', function(event) {
+    if($(event.target).find(":selected").val() == 'none') {
+      $('#no_existing_dhcp_fields').show();
+    } else {
+      $('#no_existing_dhcp_fields').hide();
+    }
+  });
+});

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

@@ -103,6 +103,30 @@ $(function () {
     }
   }
 
+  showNeutronMl2Mechanisms();
+  $("input[name='staypuft_deployment[neutron][core_plugin]']").change(showNeutronMl2Mechanisms);
+  function showNeutronMl2Mechanisms() {
+    $('#staypuft_deployment_neutron_core_plugin_ml2').parent().parent().parent().removeClass('col-md-4').addClass('col-md-6')
+    if ($('#staypuft_deployment_neutron_core_plugin_ml2').is(":checked")) {
+      $('#staypuft_deployment_neutron_core_plugin_ml2').parent().after($('.neutron_ml2_mechanisms'));
+      $('.neutron_ml2_mechanisms').fadeIn(duration);
+    } else {
+      $('.neutron_ml2_mechanisms').fadeOut(duration);
+    }
+  }
+
+  showNeutronN1kvParameters();
+  $("input[name='staypuft_deployment[neutron][core_plugin]']").change(showNeutronN1kvParameters);
+  function showNeutronN1kvParameters() {
+    $('#staypuft_deployment_neutron_core_plugin_n1kv').parent().parent().parent().removeClass('col-md-4').addClass('col-md-6')
+    if ($('#staypuft_deployment_neutron_core_plugin_n1kv').is(":checked")) {
+      $('#staypuft_deployment_neutron_core_plugin_n1kv').parent().after($('.neutron_n1kv_parameters'));
+      $('.neutron_n1kv_parameters').fadeIn(duration);
+    } else {
+      $('.neutron_n1kv_parameters').fadeOut(duration);
+    }
+  }
+
   showNeutronExternalInterface();
   $("input[name='staypuft_deployment[neutron][use_external_interface]']").change(showNeutronExternalInterface);
   function showNeutronExternalInterface() {
@@ -260,6 +284,21 @@ $(function () {
     })
   });
 
+  $('#new_subnet_modal').on('shown.bs.modal', function(e) {
+    var height = $(window).height() - 200;
+    $(this).find(".modal-body").css("max-height", height);
+    var to_path = $('#new_subnet_modal').data('path');
+    $.ajax({
+        url: to_path,
+        type: "GET",
+        success: function(data){
+          $('#new_subnet_ajax_content').html(data).promise().done(function(){
+            new_subnet();
+          });
+        }
+    });
+  });
+
   var scrolled = false;
 
   $(window).scroll(function(){

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

@@ -1,4 +1,4 @@
-$(function() {
+var subnets_assigments = (function() {
   $("div.subnet-type-pull").draggable({
     revert: 'invalid'
   });
@@ -69,3 +69,7 @@ $(function() {
     }
   });
 });
+
+$(function() {
+  subnets_assigments();
+});

data/app/controllers/staypuft/concerns/hosts_api_extensions.rb

@@ -0,0 +1,18 @@
+module Staypuft::Concerns::HostsApiExtensions
+  extend ActiveSupport::Concern
+
+  included do
+    prepend_before_filter :check_openstack_hostgroup, only: [:create, :update]
+  end
+
+  def check_openstack_hostgroup
+    if params[:host] and params[:host][:hostgroup_id]
+      hostgroup_id = params[:host][:hostgroup_id]
+      hg = Hostgroup.find(hostgroup_id)
+      if hg.ancestors.include? Hostgroup.get_base_hostgroup
+        Rails.logger.error "Cannot set a deployment hostgroup directly."
+        render :json => {:error => {:message => _('Cannot set a deployment hostgroup directly.') } }, :status => :forbidden
+      end
+    end
+  end
+end

data/app/controllers/staypuft/concerns/hosts_controller_extensions.rb

@@ -0,0 +1,38 @@
+module Staypuft::Concerns::HostsControllerExtensions
+  extend ActiveSupport::Concern
+
+  included do
+    before_filter :check_openstack_hostgroup, only: [:create, :update]
+    before_filter :check_openstack_hostgroup_multiple, only: [:update_multiple_hostgroup]
+  end
+
+  def check_openstack_hostgroup
+    if params[:host] and params[:host][:hostgroup_id]
+      hostgroup_id = params[:host][:hostgroup_id]
+      if openstack_hostgroup? hostgroup_id
+        Rails.logger.error "Cannot set a deployment hostgroup directly."
+        error _('Invalid host group selected! Cannot select OpenStack deployment host group.')
+        render :action => :edit and return
+      end
+    end
+  end
+
+  def check_openstack_hostgroup_multiple
+    if params["hostgroup"] and params["hostgroup"]["id"]
+      check_hostgroup params["hostgroup"]["id"] do
+      if openstack_hostgroup? hostgroup_id
+        error _('Invalid host group selected! Cannot select OpenStack deployment host group.')
+        redirect_to(select_multiple_hostgroup_hosts_path) and return
+      end
+    end
+  end
+
+  private
+
+  def openstack_hostgroup?(id)
+    hg = Hostgroup.find(id)
+    hg.ancestors.include? Hostgroup.get_base_hostgroup
+  rescue
+    false
+  end
+end

data/app/controllers/staypuft/subnets_controller.rb

@@ -0,0 +1,25 @@
+module Staypuft
+  class SubnetsController < Staypuft::ApplicationController
+
+    layout false
+
+    before_filter :get_deployment
+
+    def new
+      @simple_subnet = SimpleSubnet.new
+    end
+
+    def create
+      @simple_subnet = SimpleSubnet.new(params[:staypuft_simple_subnet])
+      @simple_subnet.deployment = @deployment
+      @result = @simple_subnet.save
+    end
+
+    private
+
+    def get_deployment
+      @deployment = Deployment.find(params[:deployment_id])
+    end
+
+  end
+end

data/app/lib/staypuft/seeder.rb

@@ -256,6 +256,13 @@ module Staypuft
       network_private_iface       = { :string => "<%= @host.network_query.interface_for_host('#{Staypuft::SubnetType::TENANT}') %>" }
       network_public_iface        = { :string => "<%= @host.network_query.interface_for_host('#{Staypuft::SubnetType::EXTERNAL}') %>" }
       network_create_networks     = true
+      nova_conf_additional_params = { :hash =>  { 'quota_instances' => 'default',
+                                                  'quota_cores' => 'default',
+                                                  'quota_ram' => 'default',
+                                                  'quota_floating_ips'  => 'default',
+                                                  'quota_fixed_ips' => 'default',
+                                                  'quota_driver' => 'default' }
+                                    }
 
       # Neutron
       ovs_vlan_ranges             = { :array =>  '<%= @host.deployment.neutron.networker_vlan_ranges %>' }
@@ -274,6 +281,17 @@ module Staypuft
       compute_ovs_bridge_mappings = { :array =>  '<%= @host.deployment.neutron.compute_ovs_bridge_mappings(@host) %>' }
       compute_ovs_bridge_uplinks  = { :array =>  '<%= @host.deployment.neutron.compute_ovs_bridge_uplinks(@host) %>' }
       enable_tunneling            = { :string => '<%= @host.deployment.neutron.enable_tunneling?.to_s %>' }
+      neutron_core_plugin_module  = { :string => '<%= @host.deployment.neutron.core_plugin_module %>' }
+      neutron_agent_type          = 'ovs'
+      neutron_security_group_api  = 'neutron'
+      neutron_conf_additional_params =  { :hash =>  { 'default_quota' => 'default',
+                                                      'quota_network' => 'default',
+                                                      'quota_subnet' => 'default',
+                                                      'quota_port'  => 'default',
+                                                      'quota_security_group' => 'default',
+                                                      'quota_security_group_rule' => 'default',
+                                                      'network_auto_schedule' => 'default' }
+                                        }
 
       # Glance
       backend                     = { :string => '<%= @host.deployment.glance.backend %>' }
@@ -288,17 +306,18 @@ module Staypuft
       # Cinder
       volume                      = true
       cinder_backend_gluster      = false
-      cinder_backend_gluster_name = 'gluster_backend'
+      cinder_backend_gluster_name = 'gluster'
       cinder_backend_iscsi        = { :string => '<%= @host.deployment.cinder.lvm_backend? %>' }
-      cinder_backend_iscsi_name   = 'iscsi_backend'
+      cinder_backend_iscsi_name   = 'iscsi'
       cinder_backend_nfs          = { :string => '<%= @host.deployment.cinder.nfs_backend? %>' }
-      cinder_backend_nfs_name     = 'nfs_backend'
+      cinder_backend_nfs_name     = 'nfs'
       cinder_multiple_backends    = { :string => '<%= @host.deployment.cinder.multiple_backends? %>' }
+      cinder_create_volume_types  = true
       cinder_nfs_shares           = ['<%= @host.deployment.cinder.nfs_uri %>']
       cinder_nfs_mount_options    = 'nosharecache'
 
       cinder_backend_rbd                      = { :string => '<%= @host.deployment.cinder.ceph_backend? %>' }
-      cinder_backend_rbd_name                 = 'rbd_backend'
+      cinder_backend_rbd_name                 = 'rbd'
       cinder_rbd_pool                         = 'volumes'
       cinder_rbd_ceph_conf                    = '/etc/ceph/ceph.conf'
       cinder_rbd_flatten_volume_from_snapshot = 'false'
@@ -401,6 +420,18 @@ module Staypuft
       # Cisco Nexus
       cisco_nexus_config             = { :hash => '<%= n = @host.deployment.neutron; (n.active? && n.cisco_nexus_mechanism?) ? n.compute_cisco_nexus_config : {} %>' }
 
+      # Cisco N1KV params
+      n1kv_vsm_ip                    = { :string => '<%= n = @host.deployment.neutron; (n.active? && n.n1kv_plugin?) ? n.n1kv_vsm_ip : "" %>' }
+      n1kv_vsm_password              = { :string => '<%= n = @host.deployment.neutron; (n.active? && n.n1kv_plugin?) ? n.n1kv_vsm_password : "" %>' }
+      n1kv_plugin_additional_params  = { :hash => { 'default_policy_profile' => 'default-pp',
+                                                    'network_node_policy_profile' => 'default-pp',
+                                                    'poll_duration' => '10',
+                                                    'http_pool_size' => '4',
+                                                    'http_timeout' => '120',
+                                                    'firewall_driver' => 'neutron.agent.firewall.NoopFirewallDriver',
+                                                    'enable_sync_on_start' => 'True' }
+                                      }
+
       {
           'quickstack::nova_network::controller'   => {
               'amqp_provider'                           => amqp_provider,
@@ -422,6 +453,7 @@ module Staypuft
               'cinder_backend_eqlx'                     => cinder_backend_eqlx,
               'cinder_backend_eqlx_name'                => cinder_backend_eqlx_name,
               'cinder_multiple_backends'                => cinder_multiple_backends,
+              'cinder_create_volume_types'              => cinder_create_volume_types,
               'cinder_nfs_shares'                       => cinder_nfs_shares,
               'cinder_nfs_mount_options'                => cinder_nfs_mount_options,
               'cinder_rbd_pool'                         => cinder_rbd_pool,
@@ -499,6 +531,7 @@ module Staypuft
               'cinder_backend_eqlx'                     => cinder_backend_eqlx,
               'cinder_backend_eqlx_name'                => cinder_backend_eqlx_name,
               'cinder_multiple_backends'                => cinder_multiple_backends,
+              'cinder_create_volume_types'              => cinder_create_volume_types,
               'cinder_nfs_shares'                       => cinder_nfs_shares,
               'cinder_nfs_mount_options'                => cinder_nfs_mount_options,
               'cinder_rbd_pool'                         => cinder_rbd_pool,
@@ -552,7 +585,14 @@ module Staypuft
               'controller_admin_host'                   => controller_admin_host,
               'controller_priv_host'                    => controller_priv_host,
               'controller_pub_host'                     => controller_pub_host,
-              'nexus_config'                            => cisco_nexus_config },
+              'nexus_config'                            => cisco_nexus_config,
+              'neutron_conf_additional_params'          => neutron_conf_additional_params,
+              'nova_conf_additional_params'             => nova_conf_additional_params,
+              'n1kv_plugin_additional_params'           => n1kv_plugin_additional_params,
+              'n1kv_vsm_ip'                             => n1kv_vsm_ip,
+              'n1kv_vsm_password'                       => n1kv_vsm_password,
+              'security_group_api'                      => neutron_security_group_api,
+              'neutron_core_plugin'                     => neutron_core_plugin_module },
           'quickstack::pacemaker::params'          => {
               'include_swift'                 => 'false',
               'include_neutron'               => neutron,
@@ -618,7 +658,9 @@ module Staypuft
               'private_ip'                    => private_ip,
               'cluster_control_ip'            => { :string => "<%= @host.deployment.network_query.controller_ips('#{Staypuft::SubnetType::MANAGEMENT}').first %>" },
               'lb_backend_server_addrs'       => { :array => "<%= @host.deployment.network_query.controller_ips('#{Staypuft::SubnetType::MANAGEMENT}') %>" },
-              'lb_backend_server_names'       => { :array => '<%= @host.deployment.network_query.controller_fqdns %>' } },
+              'lb_backend_server_names'       => { :array => '<%= @host.deployment.network_query.controller_fqdns %>' },
+              'agent_type'                    => neutron_agent_type,
+              'n1kv_plugin_additional_params' => n1kv_plugin_additional_params },
           'quickstack::pacemaker::common'          => {
               'pacemaker_cluster_members' => { :string => "<%= @host.deployment.network_query.controller_ips('#{Staypuft::SubnetType::CLUSTER_MGMT}').join(' ') %>" },
               'fencing_type'                  => fencing_type,
@@ -631,17 +673,24 @@ module Staypuft
               'fence_ipmilan_expose_lanplus'  => fence_ipmilan_expose_lanplus,
               'fence_ipmilan_lanplus_options' => fence_ipmilan_lanplus_options },
           'quickstack::pacemaker::neutron'         => {
-              'ml2_network_vlan_ranges'  => ml2_network_vlan_ranges,
-              'ml2_tenant_network_types' => ml2_tenant_network_types,
-              'ml2_tunnel_id_ranges'     => ml2_tunnel_id_ranges,
-              'ml2_mechanism_drivers'    => ml2_mechanism_drivers,
-              'enable_tunneling'         => enable_tunneling,
-              'ovs_bridge_mappings'      => ovs_bridge_mappings,
-              'ovs_bridge_uplinks'       => ovs_bridge_uplinks,
-              'ovs_tunnel_iface'         => ovs_tunnel_iface,
-              'ovs_tunnel_types'         => ovs_tunnel_types,
-              'ovs_vlan_ranges'          => ovs_vlan_ranges,
-              'nexus_config'             => cisco_nexus_config },
+              'ml2_network_vlan_ranges'        => ml2_network_vlan_ranges,
+              'ml2_tenant_network_types'       => ml2_tenant_network_types,
+              'ml2_tunnel_id_ranges'           => ml2_tunnel_id_ranges,
+              'ml2_mechanism_drivers'          => ml2_mechanism_drivers,
+              'enable_tunneling'               => enable_tunneling,
+              'ovs_bridge_mappings'            => ovs_bridge_mappings,
+              'ovs_bridge_uplinks'             => ovs_bridge_uplinks,
+              'ovs_tunnel_iface'               => ovs_tunnel_iface,
+              'ovs_tunnel_types'               => ovs_tunnel_types,
+              'ovs_vlan_ranges'                => ovs_vlan_ranges,
+              'nexus_config'                   => cisco_nexus_config,
+              'core_plugin'                    => neutron_core_plugin_module,
+              'neutron_conf_additional_params' => neutron_conf_additional_params,
+              'nova_conf_additional_params'    => nova_conf_additional_params,
+              'n1kv_plugin_additional_params'  => n1kv_plugin_additional_params,
+              'n1kv_vsm_ip'                    => n1kv_vsm_ip,
+              'n1kv_vsm_password'              => n1kv_vsm_password,
+              'security_group_api'             => neutron_security_group_api },
           'quickstack::pacemaker::glance'          => {
               'backend'         => backend,
               'pcmk_fs_type'    => pcmk_fs_type,
@@ -705,7 +754,8 @@ module Staypuft
               'neutron_metadata_proxy_secret' => neutron_metadata_proxy_secret,
               'amqp_host'                     => amqp_host,
               'mysql_host'                    => mysql_host,
-              'controller_priv_host'          => controller_priv_host },
+              'controller_priv_host'          => controller_priv_host,
+              'agent_type'                    => neutron_agent_type },
           'quickstack::storage_backend::cinder'    => {
               'amqp_provider'        => amqp_provider,
               'cinder_db_password'   => cinder_db_pw,
@@ -782,7 +832,9 @@ module Staypuft
               'auth_host'                  => auth_host,
               'neutron_host'               => neutron_host,
               'nova_host'                  => nova_host,
-              'private_ip'                 => private_ip },
+              'private_ip'                 => private_ip,
+              'agent_type'                 => neutron_agent_type,
+              'security_group_api'         => neutron_security_group_api },
           'quickstack::pacemaker::rsync::keystone' => {
               'keystone_private_vip' => vip_format(:keystone) },
           'quickstack::ceph::config' => {

data/app/models/staypuft/deployment.rb

@@ -16,7 +16,8 @@ module Staypuft
     EXPORT_SERVICES = [:nova, :neutron, :glance, :cinder, :passwords, :ceph]
 
     attr_accessible :description, :name, :layout_id, :layout,
-                    :amqp_provider, :layout_name, :networking, :platform
+                    :amqp_provider, :layout_name, :networking, :platform,
+                    :custom_repos
     after_save :update_hostgroup_name
     after_validation :check_form_complete
 
@@ -198,7 +199,7 @@ module Staypuft
     class Jail < Safemode::Jail
       allow :amqp_provider, :networking, :layout_name, :platform, :nova_networking?, :neutron_networking?,
         :nova, :neutron, :glance, :cinder, :passwords, :ceph, :ha?, :non_ha?,
-        :hide_ceph_notification?, :network_query
+        :hide_ceph_notification?, :network_query, :has_custom_repos?, :custom_repos_paths
     end
 
     # TODO(mtaylor)
@@ -288,6 +289,14 @@ module Staypuft
       @network_query || NetworkQuery.new(self)
     end
 
+    def has_custom_repos?
+      self.custom_repos.present?
+    end
+
+    def custom_repos_paths
+      self.custom_repos.split("\n")
+    end
+
     private
 
     def update_layout

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

@@ -136,7 +136,7 @@ module Staypuft
     end
 
     def compute_eqlx_backend_names
-      self.eqlxs.collect.with_index { |e,i| "eqlx_backend#{i+1}" }
+      self.eqlxs.collect.with_index { |e,i| "eqlx#{i+1}" }
     end
 
     private

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

@@ -37,29 +37,7 @@ module Staypuft
     end
 
     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
+      include Staypuft::Deployment::IpAddressValidator
     end
 
     validates :san_ip,

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

@@ -0,0 +1,30 @@
+module Staypuft
+  module Deployment::IpAddressValidator
+    NOT_RANGE_MSG = N_("Specify single IP address, not range")
+    INVALID_IP_OR_FQDN_MSG = N_("Invalid IP address or FQDN supplied")
+
+    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, NOT_RANGE_MSG
+          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_OR_FQDN_MSG
+          false
+        end
+      end
+    end
+  end
+end