staypuft 0.5.16 → 0.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74a5862bd668b6f98ac0a65f485cf5ae57ce4897
-  data.tar.gz: e7c7a890e4c73c74722626a4c0d0e90d9ab56332
+  metadata.gz: a2e91c90ca8e9b70669cbb9a5fe75be55fbbf977
+  data.tar.gz: c823eea5c150ddd9044c4d4a549a0883e3ed583a
 SHA512:
-  metadata.gz: 633895bb0b6737544b067b7dbbfc7d248e2e5fe14a49efcbfaec36aa39fb54c3282aa652f14fd4c4efb6452ba726254c3986a52b5f253a2906ab524af63b0fc1
-  data.tar.gz: 626fae057c887bd398b803cfd521228dd9fae377823904ec1063c1b1dda86f4c88f9f9d39e7b38683443dbb396f67146492777f71875bbffc4589838e02ec754
+  metadata.gz: 43a3e7557a2978915e8462b8bcf21f70967cba8f8ef40f49714e8852ee127370ff45c631444ba3fab8792482245df07ef7001e6e0816767ca6cb994387c6a416
+  data.tar.gz: 0ffbd027d808222eaf87b49d66adca6b6b6562f29e792f5cbe93a72b631f43a83a9a808a9b38f7485e0c9465ccf21cab80de24d639c98d50ad9ed9343556bab4

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

@@ -221,61 +221,6 @@ $('.neutron_ml2_mechanisms').parent().parent().removeClass('col-md-6').addClass(
     }
   }
 
-  showCinderNetApp();
-  // trigger function whenever NetApp checkmark is changed
-  $("#staypuft_deployment_cinder_backend_netapp").change(showCinderNetApp);
-
-  /**
-   * Shows NetApp configuration options if it is selected as a backend
-   */
-  function showCinderNetApp() {
-    if ($('#staypuft_deployment_cinder_backend_netapp').is(":checked")) {
-      $('.cinder_netapp').show();
-      if($('#netapps').children().length == 0) {
-        $('.add_another_netapp').click();
-      }
-    }
-    else {
-      $('.cinder_netapp').hide();
-    }
-  }
-
-  /**
-   * The user first selects their NetApp storage family and protocol
-   * and then relevant options are presented to them.
-   */
-  function showHideNetAppOptions(){
-    $('#netapps').children().each(function(){
-      var family = $(this).find('.netapp-main select[name*=storage_family]').val()
-      var protocol = $(this).find('.netapp-main select[name*=storage_protocol]').val()
-
-      // Hide all NetApp options
-      $(this).find('.netapp-option').hide();
-      $(this).find('.netapp-main select[name*=storage_protocol]').removeAttr("disabled");
-
-      // Selectively show options based on storage family & protocol
-      if (family == 'eseries'){
-        protocol = 'iscsi';
-        $(this).find('.netapp-main select[name*=storage_protocol]').val(protocol).attr('disabled', 'disabled');
-        $(this).find('.netapp-eseries').show();
-      }
-
-      if (protocol == 'nfs'){
-        $(this).find('.netapp-nfs').show();
-      }
-
-      if (protocol == 'iscsi' && family == 'ontap_7mode'){
-        $(this).find('.netapp-7mode-iscsi').show();
-      }
-
-      if (family == 'ontap_cluster'){
-        $(this).find('.netapp-vserver').show();
-      }
-
-    })
-
-  }
-
   showNeutronMl2CiscoNexus();
   $("#staypuft_deployment_neutron_ml2_cisco_nexus").change(showNeutronMl2CiscoNexus);
   function showNeutronMl2CiscoNexus() {
@@ -468,25 +413,6 @@ $('.neutron_ml2_mechanisms').parent().parent().removeClass('col-md-6').addClass(
     }
   })
 
-  /**
-   * Adds another NetApp storage system configuration section
-   */
-  $("button.add_another_netapp").live("click", function() {
-    var netapp_form = function () {
-      return $('#netapp_form_template').text().replace(/NEW_RECORD/g, new Date().getTime());
-    }
-    $('#netapps').append(netapp_form());
-    if($('#netapps').children().length > 1) {
-      var added_form_span = $('#netapps').children().last().find('h5').find('.server_number');
-      var previous_span_number = $('#netapps').children().eq(-2).find('h5').find('.server_number');
-      added_form_span.html(parseInt(previous_span_number.html(), 10) + 1);
-    }
-
-    // Unbind existing handlers & add event handlers to all NetApp config sections
-    $(".netapp-main select[name*=storage_family]").unbind().change(showHideNetAppOptions);
-    $(".netapp-main select[name*=storage_protocol]").unbind().change(showHideNetAppOptions);
-  })
-
   $("button.add_another_switch").live("click", function() {
     var nexus_form = function() {
       return $('#nexus_form_template').text().replace(/NEW_RECORD/g, new Date().getTime());

data/app/lib/staypuft/seeder.rb

@@ -311,23 +311,6 @@ module Staypuft
       cinder_eqlx_chap_login        = { :array => '<%= @host.deployment.cinder.compute_eqlx_chap_logins %>' }
       cinder_eqlx_chap_password     = { :array => '<%= @host.deployment.cinder.compute_eqlx_chap_passwords %>' }
 
-      cinder_backend_netapp           = { :string => '<%= @host.deployment.cinder.netapp_backend? %>' }
-      cinder_netapp_hostname          = { :array => '<%= @host.deployment.cinder.compute_netapp_hostnames %>' }
-      cinder_netapp_login             = { :array => '<%= @host.deployment.cinder.compute_netapp_logins %>' }
-      cinder_netapp_password          = { :array => '<%= @host.deployment.cinder.compute_netapp_passwords %>' }
-      cinder_netapp_server_port       = { :array => '<%= @host.deployment.cinder.compute_netapp_server_ports %>' }
-      cinder_netapp_storage_family    = { :array => '<%= @host.deployment.cinder.compute_netapp_storage_families %>' }
-      cinder_netapp_transport_type    = { :array => '<%= @host.deployment.cinder.compute_netapp_transport_types %>' }
-      cinder_netapp_storage_protocol  = { :array => '<%= @host.deployment.cinder.compute_netapp_storage_protocols %>' }
-      cinder_netapp_nfs_shares        = { :array => '<%= @host.deployment.cinder.compute_netapp_nfs_shares %>' }
-      cinder_netapp_nfs_shares_config = { :array => '<%= @host.deployment.cinder.compute_netapp_nfs_shares_configs %>' }
-      cinder_netapp_volume_list       = { :array => '<%= @host.deployment.cinder.compute_netapp_volume_lists %>' }
-      cinder_netapp_vfiler            = { :array => '<%= @host.deployment.cinder.compute_netapp_vfilers %>' }
-      cinder_netapp_vserver           = { :array => '<%= @host.deployment.cinder.compute_netapp_vservers %>' }
-      cinder_netapp_controller_ips    = { :array => '<%= @host.deployment.cinder.compute_netapp_controller_ips %>' }
-      cinder_netapp_sa_password       = { :array => '<%= @host.deployment.cinder.compute_netapp_sa_passwords %>' }
-      cinder_netapp_storage_pools     = { :array => '<%= @host.deployment.cinder.compute_netapp_storage_pools %>' }
-
       # Keystone
       keystonerc = 'true'
 
@@ -544,7 +527,6 @@ module Staypuft
               'rbd_user'                         => cinder_rbd_user,
               'rbd_secret_uuid'                  => cinder_rbd_secret_uuid,
               'backend_eqlx'                     => cinder_backend_eqlx,
-              'backend_netapp'                   => cinder_backend_netapp,
               'san_ip'                           => cinder_san_ip,
               'san_login'                        => cinder_san_login,
               'san_password'                     => cinder_san_password,
@@ -553,22 +535,7 @@ module Staypuft
               'eqlx_pool'                        => cinder_eqlx_pool,
               'eqlx_use_chap'                    => cinder_eqlx_use_chap,
               'eqlx_chap_login'                  => cinder_eqlx_chap_login,
-              'eqlx_chap_password'               => cinder_eqlx_chap_password,
-              'netapp_hostname'                  => cinder_netapp_hostname,
-              'netapp_login'                     => cinder_netapp_login,
-              'netapp_password'                  => cinder_netapp_password,
-              'netapp_server_port'               => cinder_netapp_server_port,
-              'netapp_storage_family'            => cinder_netapp_storage_family,
-              'netapp_transport_type'            => cinder_netapp_transport_type,
-              'netapp_storage_protocol'          => cinder_netapp_storage_protocol,
-              'netapp_nfs_shares'                => cinder_netapp_nfs_shares,
-              'netapp_nfs_shares_config'         => cinder_netapp_nfs_shares_config,
-              'netapp_volume_list'               => cinder_netapp_volume_list,
-              'netapp_vfiler'                    => cinder_netapp_vfiler,
-              'netapp_vserver'                   => cinder_netapp_vserver,
-              'netapp_controller_ips'            => cinder_netapp_controller_ips,
-              'netapp_sa_password'               => cinder_netapp_sa_password,
-              'netapp_storage_pools'             => cinder_netapp_storage_pools },
+              'eqlx_chap_password'               => cinder_eqlx_chap_password },
           'quickstack::pacemaker::keystone'        => {
               'keystonerc'     => keystonerc,
               'admin_password' => admin_pw,

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

@@ -5,12 +5,11 @@ module Staypuft
       'cinder'
     end
 
-    BACKEND_TYPE_PARAMS = :backend_eqlx, :backend_nfs, :backend_lvm, :backend_ceph, :backend_netapp
+    BACKEND_TYPE_PARAMS = :backend_eqlx, :backend_nfs, :backend_lvm, :backend_ceph
     BACKEND_PARAMS = :nfs_uri, :rbd_secret_uuid
 
     param_attr *BACKEND_TYPE_PARAMS, *BACKEND_PARAMS
     param_attr_array :eqlxs => Equallogic
-    param_attr_array :netapps => Netapp
 
     after_save :set_lvm_ptable
 
@@ -19,12 +18,10 @@ module Staypuft
       NFS        = 'nfs'
       CEPH       = 'ceph'
       EQUALLOGIC = 'equallogic'
-      NETAPP     = 'netapp'
       LABELS     = { LVM        => N_('LVM'),
                      NFS        => N_('NFS'),
                      CEPH       => N_('Ceph'),
-                     EQUALLOGIC => N_('EqualLogic'),
-                     NETAPP     => N_('NetApp') }
+                     EQUALLOGIC => N_('EqualLogic') }
       TYPES      = LABELS.keys
       HUMAN      = N_('Choose Driver Backend')
     end
@@ -65,70 +62,12 @@ module Staypuft
     validate :equallogic_backends,
              :if          => :equallogic_backend?
 
-    module NetappHostname
-      HUMAN   = N_('Hostname:')
-    end
-    module NetappLogin
-      HUMAN   = N_('Login:')
-    end
-    module NetappPassword
-      HUMAN   = N_('Password:')
-    end
-    module NetappServerPort
-      HUMAN   = N_('Server Port:')
-    end
-    module NetappStorageFamily
-      HUMAN   = N_('Storage Family:')
-    end
-    module NetappTransportType
-      HUMAN   = N_('Transport Type:')
-    end
-    module NetappStorageProtocol
-      HUMAN   = N_('Storage Protocol:')
-    end
-    module NetappNfsShares
-      HUMAN   = N_('NFS Shares:')
-    end
-    module NetappNfsSharesConfig
-      HUMAN   = N_('NFS Shares Config:')
-    end
-    module NetappVolumeList
-      HUMAN   = N_('Volume List:')
-    end
-    module NetappVfiler
-      HUMAN   = N_('vFiler:')
-    end
-    module NetappVserver
-      HUMAN   = N_('Storage Virtual Machine (SVM):')
-    end
-    module NetappControllerIps
-      HUMAN   = N_('Controller IPs:')
-    end
-    module NetappSaPassword
-      HUMAN   = N_('SA Password:')
-    end
-    module NetappStoragePools
-      HUMAN   = N_('Storage Pools:')
-    end
-
-    validates :netapps,
-              :presence   => true,
-              :if         => :netapp_backend?
-    validate :netapp_backends,
-             :if          => :netapp_backend?
-
     class Jail < Safemode::Jail
-      allow :lvm_backend?, :nfs_backend?, :ceph_backend?, :equallogic_backend?, :netapp_backend?,
+      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, :compute_eqlx_thin_provision,
-        :compute_eqlx_use_chap, :compute_eqlx_chap_logins, :compute_eqlx_chap_passwords,
-        :netapps, :compute_netapp_hostnames, :compute_netapp_logins, :compute_netapp_passwords,
-        :compute_netapp_server_ports, :compute_netapp_storage_families,
-        :compute_netapp_transport_types, :compute_netapp_storage_protocolss,
-        :compute_netapp_nfs_shares, :compute_netapp_nfs_shares_configs, :compute_netapp_volume_list,
-        :compute_netapp_vfilers, :compute_netapp_vservers, :compute_netapp_controller_ips,
-        :compute_netapp_sa_passwords, :compute_netapp_storage_pools
+        :compute_eqlx_use_chap, :compute_eqlx_chap_logins, :compute_eqlx_chap_passwords
     end
 
     def set_defaults
@@ -136,7 +75,6 @@ module Staypuft
       self.backend_ceph = "false"
       self.backend_nfs = "false"
       self.backend_eqlx = "false"
-      self.backend_netapp = "false"
       self.rbd_secret_uuid = SecureRandom.uuid
     end
 
@@ -161,13 +99,8 @@ module Staypuft
       self.backend_eqlx == "true"
     end
 
-    def netapp_backend?
-      self.backend_netapp == "true"
-    end
-
     def multiple_backends?
       (equallogic_backend? and self.eqlxs.length > 1) or
-        (netapp_backend? and self.netapps.length > 1) or
         BACKEND_TYPE_PARAMS.select { |type| send(type.to_s) == "true" }.length > 1
     end
 
@@ -182,8 +115,7 @@ module Staypuft
       { "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, "backend_netapp" => backend_netapp,
-        "netapps" => self.netapps }
+        "eqlxs" => self.eqlxs }
     end
 
     def lvm_ptable
@@ -230,11 +162,5 @@ module Staypuft
         errors.add :base, _("Please fix the problems in selected backends")
       end
     end
-
-    def netapp_backends
-      unless self.netapps.all? { |item| item.valid? }
-        errors.add :base, _("Please fix the problems in selected backends")
-      end
-    end
   end
 end

data/app/views/staypuft/steps/_cinder.html.erb

@@ -35,13 +35,6 @@
                                  :unchecked_value => 'false',
                                  :text            => _(Staypuft::Deployment::CinderService::DriverBackend::LABELS['equallogic']))
       %>
-
-      <%= check_box_f_non_inline(p, :backend_netapp,
-                                 :checked_value   => 'true',
-                                 :unchecked_value => 'false',
-                                 :text            => _(Staypuft::Deployment::CinderService::DriverBackend::LABELS['netapp']))
-      %>
-
       <div class="cinder_equallogic col-md-offset-1 hide">
         <div id="eqlxs" class="cinder_equallogic_picker">
         <% @deployment.cinder.eqlxs.each_with_index do |eqlx, index| %>
@@ -55,20 +48,6 @@
         </script>
         <button type="button" class= "btn btn-primary btn-sm add_another_server"><%= _("Add Another Server") %></button>
     </div>
-
-      <div class="cinder_netapp col-md-offset-1 hide">
-        <div id="netapps" class="cinder_netapp_picker">
-        <% @deployment.cinder.netapps.each_with_index do |netapp, index| %>
-          <%= p.fields_for "netapps[]", netapp, index: index do |e| %>
-            <% render partial: 'cinder_netapp_form', locals: {e: e} %>
-          <% end %>
-        <% end %>
-        </div>
-        <script type='html/template' id='netapp_form_template'>
-          <%= p.fields_for 'netapps[]', Staypuft::Deployment::CinderService::Netapp.new, index: 'NEW_RECORD' do |e| render(partial: 'cinder_netapp_form', locals: {e: e}); end %>
-        </script>
-        <button type="button" class= "btn btn-primary btn-sm add_another_netapp"><%= _("Add Another NetApp Storage System") %></button>
-      </div>
     <%end%>
   </div>
 </div>

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.5.16'
+  VERSION = '0.5.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.17
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
@@ -101,201 +101,199 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/javascripts/staypuft/nics_assignment.js
+- LICENSE
+- README.md
+- Rakefile
 - app/assets/javascripts/staypuft/host_edit.js
 - app/assets/javascripts/staypuft/new_subnet.js
+- app/assets/javascripts/staypuft/nics_assignment.js
 - app/assets/javascripts/staypuft/staypuft.js
 - app/assets/javascripts/staypuft/subnets_assignment.js
 - app/assets/stylesheets/staypuft/bootstrap_and_overrides.css.scss
 - app/assets/stylesheets/staypuft/foreman_helper.scss
 - app/assets/stylesheets/staypuft/staypuft.css.scss
 - app/controllers/staypuft/application_controller.rb
-- app/controllers/staypuft/subnet_typings_controller.rb
-- app/controllers/staypuft/interface_assignments_controller.rb
-- app/controllers/staypuft/steps_controller.rb
+- app/controllers/staypuft/bonds_controller.rb
 - app/controllers/staypuft/concerns/hosts_api_extensions.rb
 - app/controllers/staypuft/concerns/hosts_controller_extensions.rb
 - app/controllers/staypuft/deployments_controller.rb
+- app/controllers/staypuft/interface_assignments_controller.rb
+- app/controllers/staypuft/steps_controller.rb
+- app/controllers/staypuft/subnet_typings_controller.rb
 - app/controllers/staypuft/subnets_controller.rb
-- app/controllers/staypuft/bonds_controller.rb
-- app/models/staypuft/fencing.rb
-- app/models/staypuft/simple_subnet.rb
-- app/models/staypuft/layout_role.rb
-- app/models/staypuft/interface_assigner.rb
-- app/models/staypuft/role.rb
-- app/models/staypuft/deployment/vlan_range_values_validator.rb
+- app/helpers/staypuft/application_helper.rb
+- app/helpers/staypuft/deployments_helper.rb
+- app/helpers/staypuft/hosts_helper.rb
+- app/lib/actions/staypuft/deployment/deploy.rb
+- app/lib/actions/staypuft/deployment/populate.rb
+- app/lib/actions/staypuft/host/assert_report_success.rb
+- app/lib/actions/staypuft/host/create.rb
+- app/lib/actions/staypuft/host/deploy.rb
+- app/lib/actions/staypuft/host/puppet_run.rb
+- app/lib/actions/staypuft/host/report_wait.rb
+- app/lib/actions/staypuft/host/trigger_provisioning.rb
+- app/lib/actions/staypuft/host/update.rb
+- app/lib/actions/staypuft/host/wait_until_provisioned.rb
+- app/lib/actions/staypuft/host/wait_until_ready.rb
+- app/lib/actions/staypuft/hostgroup/ordered_deploy.rb
+- app/lib/actions/staypuft/middleware/as_current_user.rb
+- app/lib/actions/staypuft/middleware/timeout.rb
+- app/lib/staypuft/deployment_param_exporter.rb
+- app/lib/staypuft/deployment_param_importer.rb
+- app/lib/staypuft/exception.rb
+- app/lib/staypuft/network_query.rb
+- app/lib/staypuft/seeder.rb
+- app/models/setting/staypuft_provisioning.rb
+- app/models/staypuft/concerns/environment_extensions.rb
+- app/models/staypuft/concerns/host_details_helper.rb
+- app/models/staypuft/concerns/host_fencing_extensions.rb
+- app/models/staypuft/concerns/host_interface_management.rb
+- app/models/staypuft/concerns/host_open_stack_affiliation.rb
+- app/models/staypuft/concerns/host_orchestration_build_hook.rb
+- app/models/staypuft/concerns/hostgroup_extensions.rb
+- app/models/staypuft/concerns/lookup_key_extensions.rb
+- app/models/staypuft/concerns/nic_fencing_extensions.rb
+- app/models/staypuft/concerns/puppetclass_extensions.rb
+- app/models/staypuft/deployment.rb
+- app/models/staypuft/deployment/abstract_param_scope.rb
+- app/models/staypuft/deployment/attribute_param_storage.rb
 - app/models/staypuft/deployment/ceph_service.rb
-- app/models/staypuft/deployment/nova_service.rb
 - app/models/staypuft/deployment/cinder_service.rb
-- app/models/staypuft/deployment/nfs_uri_validator.rb
-- app/models/staypuft/deployment/abstract_param_scope.rb
-- app/models/staypuft/deployment/neutron_service/cisconexus.rb
 - app/models/staypuft/deployment/cinder_service/equallogic.rb
-- app/models/staypuft/deployment/cinder_service/netapp.rb
-- app/models/staypuft/deployment/neutron_service.rb
-- app/models/staypuft/deployment/ip_check.rb
 - app/models/staypuft/deployment/glance_service.rb
-- app/models/staypuft/deployment/attribute_param_storage.rb
 - app/models/staypuft/deployment/ip_address_validator.rb
+- app/models/staypuft/deployment/ip_check.rb
+- app/models/staypuft/deployment/neutron_service.rb
+- app/models/staypuft/deployment/neutron_service/cisconexus.rb
+- app/models/staypuft/deployment/nfs_uri_validator.rb
+- app/models/staypuft/deployment/nova_service.rb
 - app/models/staypuft/deployment/passwords.rb
+- app/models/staypuft/deployment/vlan_range_values_validator.rb
+- app/models/staypuft/deployment_role_hostgroup.rb
 - app/models/staypuft/deployment_vip_nic.rb
-- app/models/staypuft/service_class.rb
-- app/models/staypuft/subnet_type.rb
+- app/models/staypuft/fencing.rb
+- app/models/staypuft/interface_assigner.rb
 - app/models/staypuft/layout.rb
-- app/models/staypuft/concerns/hostgroup_extensions.rb
-- app/models/staypuft/concerns/puppetclass_extensions.rb
-- app/models/staypuft/concerns/nic_fencing_extensions.rb
-- app/models/staypuft/concerns/host_details_helper.rb
-- app/models/staypuft/concerns/environment_extensions.rb
-- app/models/staypuft/concerns/host_interface_management.rb
-- 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/host_open_stack_affiliation.rb
+- app/models/staypuft/layout_role.rb
+- app/models/staypuft/layout_subnet_type.rb
+- app/models/staypuft/role.rb
+- app/models/staypuft/role_class.rb
 - app/models/staypuft/role_service.rb
 - app/models/staypuft/service.rb
-- app/models/staypuft/role_class.rb
-- app/models/staypuft/layout_subnet_type.rb
-- app/models/staypuft/vip_nic.rb
-- app/models/staypuft/deployment.rb
+- app/models/staypuft/service_class.rb
+- app/models/staypuft/simple_subnet.rb
+- app/models/staypuft/subnet_type.rb
 - app/models/staypuft/subnet_typing.rb
-- app/models/staypuft/deployment_role_hostgroup.rb
-- app/models/setting/staypuft_provisioning.rb
+- app/models/staypuft/vip_nic.rb
 - app/overrides/customize_foreman_tasks_show_page.rb
-- app/overrides/select_multiple_systems_hostgroup.rb
 - app/overrides/foreman_hosts_edit.rb
-- app/overrides/hosts_edit_subnet_types.rb
 - app/overrides/hide_subscription_manager_passwords.rb
-- app/lib/actions/staypuft/hostgroup/ordered_deploy.rb
-- app/lib/actions/staypuft/deployment/populate.rb
-- app/lib/actions/staypuft/deployment/deploy.rb
-- app/lib/actions/staypuft/host/assert_report_success.rb
-- app/lib/actions/staypuft/host/update.rb
-- app/lib/actions/staypuft/host/wait_until_ready.rb
-- app/lib/actions/staypuft/host/puppet_run.rb
-- app/lib/actions/staypuft/host/trigger_provisioning.rb
-- app/lib/actions/staypuft/host/report_wait.rb
-- app/lib/actions/staypuft/host/wait_until_provisioned.rb
-- app/lib/actions/staypuft/host/deploy.rb
-- app/lib/actions/staypuft/host/create.rb
-- app/lib/actions/staypuft/middleware/as_current_user.rb
-- app/lib/actions/staypuft/middleware/timeout.rb
-- app/lib/staypuft/network_query.rb
-- app/lib/staypuft/deployment_param_importer.rb
-- app/lib/staypuft/seeder.rb
-- app/lib/staypuft/exception.rb
-- app/lib/staypuft/deployment_param_exporter.rb
-- app/views/hosts/_new_nic_fields.html.erb
+- app/overrides/hosts_edit_subnet_types.rb
+- app/overrides/select_multiple_systems_hostgroup.rb
 - app/views/hosts/_fencing.html.erb
+- app/views/hosts/_new_nic_fields.html.erb
 - app/views/hosts/_primary_interface_subnet.html.erb
-- app/views/staypuft/steps/_nova.html.erb
-- app/views/staypuft/steps/services_overview.html.erb
-- app/views/staypuft/steps/_neutron_cisco_nexus_form.html.erb
-- app/views/staypuft/steps/network_configuration.html.erb
-- app/views/staypuft/steps/_cinder_equallogic_form.html.erb
-- app/views/staypuft/steps/_title.html.erb
-- app/views/staypuft/steps/services_configuration.html.erb
-- app/views/staypuft/steps/_neutron_ha.html.erb
-- app/views/staypuft/steps/deployment_settings.html.erb
-- app/views/staypuft/steps/_cinder.html.erb
-- app/views/staypuft/steps/_nova_ha.html.erb
-- app/views/staypuft/steps/_glance.html.erb
-- app/views/staypuft/steps/_neutron.html.erb
-- app/views/staypuft/steps/_cinder_netapp_form.html.erb
-- app/views/staypuft/steps/_wizard_form_buttons.html.erb
-- app/views/staypuft/subnet_types/_subnet_type_pull.html.erb
-- app/views/staypuft/layouts/staypuft.html.erb
-- app/views/staypuft/layouts/application.html.erb
-- app/views/staypuft/bonds/destroy.js.erb
+- app/views/nic/_subnet_id_field.html.erb
 - app/views/staypuft/bonds/add_slave.js.erb
 - app/views/staypuft/bonds/create.js.erb
-- app/views/staypuft/subnet_typings/destroy.js.erb
-- app/views/staypuft/subnet_typings/create.js.erb
-- app/views/staypuft/subnet_typings/update.js.erb
-- app/views/staypuft/subnets/new.html.erb
-- app/views/staypuft/subnets/create.js.erb
-- app/views/staypuft/subnets/_subnet_pull.html.erb
-- app/views/staypuft/subnets/_form.html.erb
-- app/views/staypuft/subnets/_drop_zone.html.erb
-- app/views/staypuft/interfaces/_drop_zone.html.erb
-- app/views/staypuft/interface_assignments/index.html.erb
-- app/views/staypuft/interface_assignments/destroy.js.erb
-- app/views/staypuft/interface_assignments/_interfaces.html.erb
-- app/views/staypuft/interface_assignments/create.js.erb
-- app/views/staypuft/interface_assignments/_nics_assignment.html.erb
-- app/views/staypuft/interface_assignments/_nics_assignment_overview.html.erb
-- app/views/staypuft/deployments/edit.html.erb
+- app/views/staypuft/bonds/destroy.js.erb
 - app/views/staypuft/deployments/_advanced_configuration.html.erb
+- app/views/staypuft/deployments/_assigned_hosts.html.erb
 - app/views/staypuft/deployments/_assigned_hosts_table.html.erb
-- app/views/staypuft/deployments/index.html.erb
+- app/views/staypuft/deployments/_deployed_hosts.html.erb
+- app/views/staypuft/deployments/_deployed_hosts_table.html.erb
+- app/views/staypuft/deployments/_deployment_access_all_details_dialogue.html.erb
+- app/views/staypuft/deployments/_deployment_hosts.html.erb
+- app/views/staypuft/deployments/_deployment_networking.html.erb
 - app/views/staypuft/deployments/_deployment_overview.html.erb
-- app/views/staypuft/deployments/_param_field.html.erb
-- app/views/staypuft/deployments/_host_head_row.html.erb
+- app/views/staypuft/deployments/_deployment_progress_bar.html.erb
 - app/views/staypuft/deployments/_deployment_progress_page_header.html.erb
-- app/views/staypuft/deployments/_free_hosts_table.html.erb
-- app/views/staypuft/deployments/_hosts_filter.html.erb
+- app/views/staypuft/deployments/_deployment_show_header.html.erb
+- app/views/staypuft/deployments/_deployment_summary.html.erb
 - app/views/staypuft/deployments/_empty_hosts.html.erb
-- app/views/staypuft/deployments/_assigned_hosts.html.erb
-- app/views/staypuft/deployments/_host_row.html.erb
-- app/views/staypuft/deployments/_deployment_hosts.html.erb
-- app/views/staypuft/deployments/show.html.erb
-- app/views/staypuft/deployments/_deployed_hosts_table.html.erb
-- app/views/staypuft/deployments/_deployed_hosts.html.erb
 - app/views/staypuft/deployments/_free_hosts.html.erb
-- app/views/staypuft/deployments/_hosts_table.html.erb
-- app/views/staypuft/deployments/_deployment_show_header.html.erb
+- app/views/staypuft/deployments/_free_hosts_table.html.erb
+- app/views/staypuft/deployments/_host_head_row.html.erb
+- app/views/staypuft/deployments/_host_row.html.erb
+- app/views/staypuft/deployments/_hosts_filter.html.erb
 - app/views/staypuft/deployments/_hosts_header.html.erb
-- app/views/staypuft/deployments/_deployment_access_all_details_dialogue.html.erb
-- app/views/staypuft/deployments/_deployment_progress_bar.html.erb
+- app/views/staypuft/deployments/_hosts_table.html.erb
 - app/views/staypuft/deployments/_import_form.html.erb
-- app/views/staypuft/deployments/_deployment_summary.html.erb
-- app/views/staypuft/deployments/_deployment_networking.html.erb
-- app/views/nic/_subnet_id_field.html.erb
-- app/helpers/staypuft/hosts_helper.rb
-- app/helpers/staypuft/deployments_helper.rb
-- app/helpers/staypuft/application_helper.rb
-- config/staypuft.local.rb
+- app/views/staypuft/deployments/_param_field.html.erb
+- app/views/staypuft/deployments/edit.html.erb
+- app/views/staypuft/deployments/index.html.erb
+- app/views/staypuft/deployments/show.html.erb
+- app/views/staypuft/interface_assignments/_interfaces.html.erb
+- app/views/staypuft/interface_assignments/_nics_assignment.html.erb
+- app/views/staypuft/interface_assignments/_nics_assignment_overview.html.erb
+- app/views/staypuft/interface_assignments/create.js.erb
+- app/views/staypuft/interface_assignments/destroy.js.erb
+- app/views/staypuft/interface_assignments/index.html.erb
+- app/views/staypuft/interfaces/_drop_zone.html.erb
+- app/views/staypuft/layouts/application.html.erb
+- app/views/staypuft/layouts/staypuft.html.erb
+- app/views/staypuft/steps/_cinder.html.erb
+- app/views/staypuft/steps/_cinder_equallogic_form.html.erb
+- app/views/staypuft/steps/_glance.html.erb
+- app/views/staypuft/steps/_neutron.html.erb
+- app/views/staypuft/steps/_neutron_cisco_nexus_form.html.erb
+- app/views/staypuft/steps/_neutron_ha.html.erb
+- app/views/staypuft/steps/_nova.html.erb
+- app/views/staypuft/steps/_nova_ha.html.erb
+- app/views/staypuft/steps/_title.html.erb
+- app/views/staypuft/steps/_wizard_form_buttons.html.erb
+- app/views/staypuft/steps/deployment_settings.html.erb
+- app/views/staypuft/steps/network_configuration.html.erb
+- app/views/staypuft/steps/services_configuration.html.erb
+- app/views/staypuft/steps/services_overview.html.erb
+- app/views/staypuft/subnet_types/_subnet_type_pull.html.erb
+- app/views/staypuft/subnet_typings/create.js.erb
+- app/views/staypuft/subnet_typings/destroy.js.erb
+- app/views/staypuft/subnet_typings/update.js.erb
+- app/views/staypuft/subnets/_drop_zone.html.erb
+- app/views/staypuft/subnets/_form.html.erb
+- app/views/staypuft/subnets/_subnet_pull.html.erb
+- app/views/staypuft/subnets/create.js.erb
+- app/views/staypuft/subnets/new.html.erb
 - config/routes.rb
-- db/seeds.rb
-- db/migrate/20140701075033_create_layout_subnet.rb
-- db/migrate/20140310023613_create_staypuft_roles.rb
-- db/migrate/20140310203855_create_staypuft_role_services.rb
-- db/migrate/20140701090256_create_staypuft_subnet_typings.rb
-- db/migrate/20140701074900_create_subnet_type.rb
-- db/migrate/20140602121501_add_amqp_provider_to_staypuft_deployment.rb
+- config/staypuft.local.rb
 - db/migrate/20140309021811_create_staypuft_layouts.rb
+- db/migrate/20140310004533_create_staypuft_deployments.rb
+- db/migrate/20140310023613_create_staypuft_roles.rb
 - db/migrate/20140310174152_create_staypuft_layout_roles.rb
+- db/migrate/20140310194221_create_staypuft_services.rb
+- db/migrate/20140310203855_create_staypuft_role_services.rb
+- db/migrate/20140312044533_create_staypuft_deployment_role_hostgroups.rb
+- db/migrate/20140312050001_create_staypuft_hostgroup_roles.rb
+- db/migrate/20140312050615_create_staypuft_role_classes.rb
+- db/migrate/20140312051144_create_staypuft_service_classes.rb
+- db/migrate/20140315031754_add_networking_to_staypuft_layout.rb
 - db/migrate/20140318163222_add_deploy_order_to_staypuft_layout_role.rb
-- db/migrate/20140825164900_add_orchestration_to_staypuft_role.rb
+- db/migrate/20140325211410_add_role_to_staypuft_deployment_role_hostgroup.rb
 - db/migrate/20140326032027_drop_staypuft_hostgroup_roles.rb
-- db/migrate/20140623142500_remove_amqp_provider_from_staypuft_deployment.rb
-- db/migrate/20141009064907_add_custom_repos_to_deployment.rb
+- db/migrate/20140507103716_add_form_step_to_staypuft_deployment.rb
 - db/migrate/20140513124807_change_column_default_form_step_on_staypuft_deployment.rb
-- db/migrate/20140312050615_create_staypuft_role_classes.rb
-- db/migrate/20140310004533_create_staypuft_deployments.rb
-- db/migrate/20140312050001_create_staypuft_hostgroup_roles.rb
+- db/migrate/20140602121501_add_amqp_provider_to_staypuft_deployment.rb
+- db/migrate/20140623142500_remove_amqp_provider_from_staypuft_deployment.rb
+- db/migrate/20140701074900_create_subnet_type.rb
+- db/migrate/20140701075033_create_layout_subnet.rb
+- db/migrate/20140701090256_create_staypuft_subnet_typings.rb
+- db/migrate/20140825164900_add_orchestration_to_staypuft_role.rb
 - db/migrate/20140831234000_add_required_to_subnet_types.rb
-- db/migrate/20140325211410_add_role_to_staypuft_deployment_role_hostgroup.rb
-- db/migrate/20140312051144_create_staypuft_service_classes.rb
 - db/migrate/20141003223000_add_validation_to_subnet_types.rb
-- db/migrate/20140312044533_create_staypuft_deployment_role_hostgroups.rb
-- db/migrate/20140315031754_add_networking_to_staypuft_layout.rb
-- db/migrate/20140507103716_add_form_step_to_staypuft_deployment.rb
+- db/migrate/20141009064907_add_custom_repos_to_deployment.rb
 - db/migrate/20141107144800_create_staypuft_deployment_vip_nics.rb
-- db/migrate/20140310194221_create_staypuft_services.rb
+- db/seeds.rb
 - lib/staypuft.rb
 - lib/staypuft/engine.rb
 - lib/staypuft/version.rb
 - lib/tasks/staypuft_tasks.rake
-- LICENSE
-- Rakefile
-- README.md
-- test/test_helper.rb
-- test/staypuft_test.rb
-- test/unit/staypuft_test.rb
-- test/test_plugin_helper.rb
 - test/factories/staypuft_factories.rb
 - test/integration/navigation_test.rb
+- test/staypuft_test.rb
+- test/test_helper.rb
+- test/test_plugin_helper.rb
+- test/unit/staypuft_test.rb
 homepage: https://github.com/theforeman/staypuft
 licenses:
 - GPL-3.0+
@@ -316,14 +314,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: OpenStack Foreman Installer
 test_files:
-- test/test_helper.rb
-- test/staypuft_test.rb
 - test/unit/staypuft_test.rb
-- test/test_plugin_helper.rb
-- test/factories/staypuft_factories.rb
 - test/integration/navigation_test.rb
+- test/staypuft_test.rb
+- test/factories/staypuft_factories.rb
+- test/test_plugin_helper.rb
+- test/test_helper.rb

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

@@ -1,59 +0,0 @@
-#encoding: utf-8
-module Staypuft
-  class Deployment::CinderService::Netapp
-    include ActiveModel::Serializers::JSON
-    include ActiveModel::Validations
-    extend ActiveModel::Naming
-
-    attr_accessor :id, :hostname, :login, :password, :server_port,
-                  :storage_family, :transport_type, :storage_protocol,
-                  :nfs_shares, :nfs_shares_config, :volume_list, :vfiler,
-                  :vserver, :controller_ips, :sa_password, :storage_pools
-    attr_reader :errors
-
-    STORAGE_FAMILIES = { :ontap_cluster => 'Clustered Data ONTAP',
-                         :ontap_7mode => 'Data ONTAP 7-mode',
-                         :eseries => 'E-Series' }
-    STORAGE_PROTOCOLS = { :nfs => 'NFS', :iscsi => 'iSCSI' }
-    TRANSPORT_TYPES = { :http => 'http', :https => 'https' }
-
-    def initialize(attrs = {})
-      @errors = ActiveModel::Errors.new(self)
-      self.attributes = attrs
-      self.server_port = 80
-      self.storage_family = 'ontap_cluster'
-      self.transport_type = 'http'
-      self.storage_protocol = 'nfs'
-    end
-
-    def self.human_attribute_name(attr, options = {})
-      attr
-    end
-
-    def self.lookup_ancestors
-      [self]
-    end
-
-    def attributes
-      { 'hostname' => nil, 'login' => nil, 'password' => nil,
-        'server_port' => nil, 'storage_family' => nil, 'transport_type' => nil,
-        'storage_protocol' => nil, 'nfs_shares' => nil, 'nfs_shares_config' => nil,
-        'volume_list' => nil, 'vfiler' => nil, 'vserver' => nil,
-        'controller_ips' => nil, 'sa_password' => nil,
-        'storage_pools' => nil }
-    end
-
-    def attributes=(attrs)
-      attrs.each { |attr, value| send "#{attr}=", value } unless attrs.nil?
-    end
-
-    validates :login,
-              presence: true,
-              format: /\A[a-zA-Z\d][\w\.\-]*[\w\-]\z/,
-              length: { maximum: 16 }
-    validates :password,
-              presence: true,
-              format: /\A[!-~]+\z/,
-              length: { minimum:3, maximum: 16 }
-  end
-end

data/app/views/staypuft/steps/_cinder_netapp_form.html.erb

@@ -1,55 +0,0 @@
-          <div class="netapp well">
-            <h5 class="muted"><a href="#" class="remove"><i class="glyphicon glyphicon-remove-sign ">&nbsp;</i></a>&nbsp;Storage System #<span class="server_number">1</span></h5>
-            
-            <div class="netapp-main">
-              <%= select_f e, :storage_family, Staypuft::Deployment::CinderService::Netapp::STORAGE_FAMILIES,
-                         :first, :last, 
-                         {},
-                         { :label => _(Staypuft::Deployment::CinderService::NetappStorageFamily::HUMAN) } %>
-              <%= select_f e, :storage_protocol, Staypuft::Deployment::CinderService::Netapp::STORAGE_PROTOCOLS,
-                         :first, :last, 
-                         {},
-                         { :label => _(Staypuft::Deployment::CinderService::NetappStorageProtocol::HUMAN) } %>
-              <%= text_f e, :hostname, class: "cinder_netapp",
-                         label:      _(Staypuft::Deployment::CinderService::NetappHostname::HUMAN) %>
-              <%= text_f e, :login, class: "cinder_netapp",
-                         label:      _(Staypuft::Deployment::CinderService::NetappLogin::HUMAN) %>
-              <%= password_f e, :password, class: "cinder_netapp",
-                         label:      _(Staypuft::Deployment::CinderService::NetappPassword::HUMAN) %>
-              <%= text_f e, :server_port, class: "cinder_netapp",
-                         label:      _(Staypuft::Deployment::CinderService::NetappServerPort::HUMAN) %>
-              
-              <%= select_f e, :transport_type, Staypuft::Deployment::CinderService::Netapp::TRANSPORT_TYPES,
-                         :first, :last,
-                         {},
-                         { :label => _(Staypuft::Deployment::CinderService::NetappTransportType::HUMAN) } %>
-            </div>
-
-            <div class="netapp-nfs netapp-option">
-              <%= text_f e, :nfs_shares, class: "cinder_netapp",
-                         label:      _(Staypuft::Deployment::CinderService::NetappNfsShares::HUMAN) %>
-              <%= text_f e, :nfs_shares_config, class: "cinder_netapp",
-                         label:      _(Staypuft::Deployment::CinderService::NetappNfsSharesConfig::HUMAN) %>
-            </div>
-
-            <div class="netapp-7mode-iscsi netapp-option hide">
-              <%= text_f e, :volume_list, class: "cinder_netapp",
-                         label:      _(Staypuft::Deployment::CinderService::NetappVolumeList::HUMAN) %>
-              <%= text_f e, :vfiler, class: "cinder_netapp",
-                         label:      _(Staypuft::Deployment::CinderService::NetappVfiler::HUMAN) %>
-            </div>
-
-            <div class="netapp-vserver netapp-option">
-              <%= text_f e, :vserver, class: "cinder_netapp",
-                         label:      _(Staypuft::Deployment::CinderService::NetappVserver::HUMAN) %>
-            </div>
-
-            <div class="netapp-eseries netapp-option hide">
-              <%= text_f e, :controller_ips, class: "cinder_netapp",
-                         label:      _(Staypuft::Deployment::CinderService::NetappControllerIps::HUMAN) %>
-              <%= text_f e, :sa_password, class: "cinder_netapp",
-                         label:      _(Staypuft::Deployment::CinderService::NetappSaPassword::HUMAN) %>
-              <%= text_f e, :storage_pools, class: "cinder_netapp",
-                         label:      _(Staypuft::Deployment::CinderService::NetappStoragePools::HUMAN) %>
-            </div>
-          </div>