staypuft 0.3.1 → 0.3.2

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

@@ -2,37 +2,42 @@
 
 <% title _("Configure Interfaces (%s hosts)") % @hosts.size %>
 
-<div id="subnets">
-  <h2><%= _("Configured Networks") %></h2>
-  <% @subnets.each do |subnet| %>
-  <% next if is_pxe?(@deployment, subnet) # we skip PXE network which is always on primary interface %>
-  <% next if @host.interfaces.where(:subnet_id => subnet.id).present? # we skip assigned subnets %>
-    <%= render 'staypuft/subnets/subnet_pull',
-               :subnet => subnet,
-               :deployment => @deployment,
-               :active => true,
-               :existing => false %>
-  <% end %>
+<div class="row">
+  <div class="col-md-12">
+    <h3><%= _("Configured Networks") %></h3>
+    <div id="subnets" class="panel panel-default">
+      <div class="panel-body">
+        <% @subnets.each do |subnet| %>
+        <% next if is_pxe?(@deployment, subnet) # we skip PXE network which is always on primary interface %>
+        <% next if @host.interfaces.vip.where(:subnet_id => subnet.id).present? # we skip assigned subnets %>
+          <%= render 'staypuft/subnets/subnet_pull',
+                     :subnet => subnet,
+                     :deployment => @deployment,
+                     :active => true,
+                     :existing => false %>
+        <% end %>
+      </div>
+    </div>
+  </div>
 </div>
 
-<div class="cleared"></div>
-<br />
-<h2><%= _("Network Interfaces") %></h2>
+<div class="row">
+  <div class="col-md-12">
+    <h3><%= _("Network Interfaces") %></h3>
+    <% if (subnet = @host.subnet) %>
+      <%= render 'staypuft/interfaces/drop_zone',
+                 :identifier => @host.primary_interface,
+                 :subnet => subnet,
+                 :deployment => @deployment,
+                 :host => @host %>
+    <% end %>
 
-<% if (subnet = @host.subnet) %>
-  <%= render 'staypuft/interfaces/drop_zone',
-             :identifier => @host.primary_interface,
-             :subnet => subnet,
-             :deployment => @deployment,
-             :host => @host %>
-<% end %>
-
-<% @interfaces.each do |interface| %>
-  <%= render 'staypuft/interfaces/drop_zone',
-             :identifier => interface.identifier,
-             :subnet => interface.subnet,
-             :deployment => @deployment,
-             :host => @host %>
-<% end %>
-
-<%= link_to _('Back to deployment'), deployment_path(@deployment) %>
+    <% @interfaces.each do |interface| %>
+      <%= render 'staypuft/interfaces/drop_zone',
+                 :identifier => interface.identifier,
+                 :subnet => interface.subnet,
+                 :deployment => @deployment,
+                 :host => @host %>
+    <% end %>
+  </div>
+</div>

data/app/views/staypuft/interfaces/_drop_zone.html.erb

@@ -1,30 +1,30 @@
-<div class="interface" id="<%= identifier %>-interface" data-interface="<%= identifier %>">
-  <div class="identifier">
-    <%= identifier %>
+<div class="panel panel-default interface" id="<%= identifier %>-interface" data-interface="<%= identifier %>">
+  <div class="panel-heading">
+    <h3 class="panel-title"><%= identifier %></h3>
   </div>
-
-  <!-- physical interface assignment (can be only one at most) -->
-  <div id="<%= identifier %>-physicals">
-    <%= render 'staypuft/subnets/subnet_pull',
-               :subnet => subnet,
-               :deployment => deployment,
-               :active => !is_pxe?(deployment, subnet),
-               :existing => true if subnet %>
-  </div>
-
-  <!-- all virtual devices attached to this physical interface assignments -->
-  <div id="<%= identifier %>-virtuals">
-    <% host.interfaces.where(:physical_device => identifier).where("subnet_id IS NOT NULL").each do |virtual| %>
+  <div class="panel-body">
+    <!-- physical interface assignment (can be only one at most) -->
+    <span id="<%= identifier %>-physicals">
       <%= render 'staypuft/subnets/subnet_pull',
-                 :subnet => virtual.subnet,
+                 :subnet => subnet,
                  :deployment => deployment,
-                 :active => true,
-                 :existing => true if virtual.subnet %>
-    <% end %>
-  </div>
+                 :active => !is_pxe?(deployment, subnet),
+                 :existing => true if subnet %>
+    </span>
+
+    <!-- all virtual devices attached to this physical interface assignments -->
+    <span id="<%= identifier %>-virtuals">
+      <% host.interfaces.where(:physical_device => identifier).where("subnet_id IS NOT NULL").each do |virtual| %>
+        <%= render 'staypuft/subnets/subnet_pull',
+                   :subnet => virtual.subnet,
+                   :deployment => deployment,
+                   :active => true,
+                   :existing => true if virtual.subnet %>
+      <% end %>
+    </span>
 
-  <div class="subnet-drop-zones">
     <div class="empty-zone">
+      &nbsp;
     </div>
   </div>
 </div>

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

@@ -1,30 +1,52 @@
-<%= f.fields_for :cinder, @deployment.cinder do |p| %>
-  <%= field(p, :driver_backend, :label => _(Staypuft::Deployment::CinderService::DriverBackend::HUMAN)) do
-    @deployment.cinder.backend_labels_for_layout.map do |value, label|
-      radio_button_f_non_inline(p, :driver_backend,
-                                :checked => @deployment.cinder.driver_backend == value,
-                                :value   => value,
-                                :text    => label)
-    end.join
-  end %>
+<div class="cinder">
+  <h5><%= _(Staypuft::Deployment::CinderService::DriverBackend::HUMAN) %></h5>
+  <div class="col-md-12 clearfix cinderPicker" id="cinderPicker">
+    <%= f.fields_for :cinder, @deployment.cinder do |p| %>
 
-  <div class="cinder_nfs_uri col-md-offset-0 hide">
-    <%= text_f p, :nfs_uri, class: "cinder_nfs_uri",
-               label:              _(Staypuft::Deployment::CinderService::NfsUri::HUMAN),
-               help_inline:        _(Staypuft::Deployment::CinderService::NfsUri::HUMAN_AFTER) %>
+      <%= check_box_f_non_inline(p, :backend_nfs,
+                                 :checked_value   => 'true',
+                                 :unchecked_value => 'false',
+                                 :text            => "NFS")
+      %>
+      <div class="cinder_nfs_uri col-md-offset-1 hide">
 
-  </div>
-  <div class="cinder_equallogic col-md-offset-0 hide">
-    <%= text_f p, :san_ip, class: "cinder_equallogic",
-               label:              _(Staypuft::Deployment::CinderService::SanIp::HUMAN) %>
-    <%= text_f p, :san_login, class: "cinder_equallogic",
-               label:              _(Staypuft::Deployment::CinderService::SanLogin::HUMAN) %>
-    <%= text_f p, :san_password, class: "cinder_equallogic",
-               label:              _(Staypuft::Deployment::CinderService::SanPassword::HUMAN) %>
-    <%= text_f p, :eqlx_pool, class: "cinder_equallogic",
-               label:              _(Staypuft::Deployment::CinderService::EqlxPool::HUMAN) %>
-    <%= text_f p, :eqlx_group_name, class: "cinder_equallogic",
-               label:              _(Staypuft::Deployment::CinderService::EqlxGroupName::HUMAN) %>
+        <%= text_f p, :nfs_uri, class: "cinder_nfs_uri",
+                   label:              _(Staypuft::Deployment::CinderService::NfsUri::HUMAN),
+                   help_inline:        _(Staypuft::Deployment::CinderService::NfsUri::HUMAN_AFTER) %>
+
+      </div>
+
+      <%= check_box_f_non_inline(p, :backend_lvm,
+                                 :checked_value   => 'true',
+                                 :unchecked_value => 'false',
+                                 :text            => "LVM")
+      %>
 
+      <%= check_box_f_non_inline(p, :backend_ceph,
+                                 :checked_value   => 'true',
+                                 :unchecked_value => 'false',
+                                 :text            => "Ceph")
+      %>
+
+      <%= check_box_f_non_inline(p, :backend_eqlx,
+                                 :checked_value   => 'true',
+                                 :unchecked_value => 'false',
+                                 :text            => "EqualLogic")
+      %>
+      <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| %>
+          <%= p.fields_for "eqlxs[]", eqlx, index: index do |e| %>
+            <% render partial: 'cinder_equallogic_form', locals: {e: e} %>
+          <% end %>
+        <% end %>
+        </div>
+        <script type='html/template' id='eqlx_form_template'>
+          <%= p.fields_for 'eqlxs[]', Staypuft::Deployment::CinderService::Equallogic.new, index: 'NEW_RECORD' do |e| render(partial: 'cinder_equallogic_form', locals: {e: e}); end %>
+        </script>
+        <button type="button" class= "btn btn-primary btn-sm add_another_server"><%= _("Add Another Server") %></button>
+    </div>
+    <%end%>
   </div>
-<% end %>
+</div>
+

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

@@ -0,0 +1,13 @@
+          <div class="eqlx well">
+          <h5 class="muted"><a href="#" class="remove"><i class="glyphicon glyphicon-remove-sign ">&nbsp;</i></a>&nbsp;Server #<span class="server_number">1</span></h5>
+          <%= text_f e, :san_ip, class: "cinder_equallogic",
+                     label:              _(Staypuft::Deployment::CinderService::SanIp::HUMAN) %>
+          <%= text_f e, :san_login, class: "cinder_equallogic",
+                     label:              _(Staypuft::Deployment::CinderService::SanLogin::HUMAN) %>
+          <%= text_f e, :san_password, class: "cinder_equallogic",
+                     label:              _(Staypuft::Deployment::CinderService::SanPassword::HUMAN) %>
+          <%= text_f e, :pool, class: "cinder_equallogic",
+                     label:              _(Staypuft::Deployment::CinderService::EqlxPool::HUMAN) %>
+          <%= text_f e, :group_name, class: "cinder_equallogic",
+                     label:              _(Staypuft::Deployment::CinderService::EqlxGroupName::HUMAN) %>
+          </div>

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

@@ -14,32 +14,4 @@
                                      help_inline:                   _(Staypuft::Deployment::NeutronService::TenantVlanRanges::HUMAN_AFTER)) %>
   </div>
 
-  <h4><%= _('Network Nodes') %> </h4>
-
-  <%= change_label_width 4, text_f(p, :networker_tenant_interface,
-                                   label:       _(Staypuft::Deployment::NeutronService::NetworkerTenantInterface::HUMAN),
-                                   help_inline: _(Staypuft::Deployment::NeutronService::NetworkerTenantInterface::HUMAN_AFTER)) %>
-
-  <%= check_box_f_non_inline(p, :use_external_interface,
-                             :checked_value   => 'true',
-                             :unchecked_value => 'false',
-                             :text            => Staypuft::Deployment::NeutronService::UseExternalInterface::HUMAN)
-  %>
-
-  <div class="neutron_external_interface col-md-offset-0 hide">
-    <%= change_label_width 4, text_f(p, :external_interface_name,
-                                     label:       _(Staypuft::Deployment::NeutronService::ExternalInterfaceName::HUMAN),
-                                     help_inline: _(Staypuft::Deployment::NeutronService::ExternalInterfaceName::HUMAN_AFTER)) %>
-
-  </div>
-
-
-  <h4><%= _('Compute Nodes') %> </h4>
-
-  <%= change_label_width 4, text_f(p, :compute_tenant_interface,
-                                   label:       _(Staypuft::Deployment::NeutronService::ComputeTenantInterface::HUMAN),
-                                   help_inline: _(Staypuft::Deployment::NeutronService::ComputeTenantInterface::HUMAN_AFTER)) %>
-
-  <%= _('NOTE: Best practice is to use a different interface than the interface used for pxe/provisioning the node. This practice is mandatory if VLAN is chosen as the tenant network type.') %>
-
 <% end %>

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

@@ -20,15 +20,4 @@
   <%= change_label_width 4, text_f(p, :private_fixed_range,
                                    label:       _(Staypuft::Deployment::NovaService::PrivateFixedRange::HUMAN),
                                    help_inline: _(Staypuft::Deployment::NovaService::PrivateFixedRange::HUMAN_AFTER)) %>
-
-  <h4><%= _('Compute Nodes') %> </h4>
-
-  <%= change_label_width 4, text_f(p, :external_interface_name, label: _(Staypuft::Deployment::NovaService::ExternalInterfaceName::HUMAN),
-                                   help_inline:                        _(Staypuft::Deployment::NovaService::ExternalInterfaceName::HUMAN_AFTER)) %>
-
-  <%= change_label_width 4, text_f(p, :compute_tenant_interface, label: _(Staypuft::Deployment::NovaService::ComputeTenantInterface::HUMAN),
-                                   help_inline:                         _(Staypuft::Deployment::NovaService::ComputeTenantInterface::HUMAN_AFTER)) %>
-
-  <%= _('NOTE: Best practice is to use a different interface than the interface used for pxe/provisioning the node. This practice is mandatory if VLAN is chosen as the tenant network type.') %>
-
 <% end %>

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

@@ -9,12 +9,16 @@
     </div>
 
     <div class="row">
-      <div id="subnet_types" class="col-md-12">
+      <div class="col-md-12">
         <%= base_errors_for @deployment %>
-        <h4><%= _("Available Roles") %></h4>
-        <% @deployment.unassigned_subnet_types.each do |subnet_type| %>
-          <%= render 'staypuft/subnet_types/subnet_type_pull', :subnet_type => subnet_type, :deployment => @deployment %>
-        <% end %>
+        <h4><%= _("Available Network Traffic Types") %></h4>
+        <div id="subnet_types" class="panel panel-default">
+          <div class="panel-body">
+            <% @deployment.unassigned_subnet_types.each do |subnet_type| %>
+              <%= render 'staypuft/subnet_types/subnet_type_pull', :subnet_type => subnet_type, :deployment => @deployment %>
+            <% end %>
+          </div>
+        </div>
       </div>
     </div>
 
@@ -24,29 +28,33 @@
           <%= display_link_if_authorized(_("New Subnet"), hash_for_new_subnet_path(:redirect => request.url + '#new')) %>
         </div>
       </div>
+    </div>
 
+    <div class="row">
       <div id="subnets" class="col-md-12">
-        <h4><%= _("Networks") %></h4>
+        <h4><%= _("Subnets") %></h4>
         <% @subnets.each do |subnet| %>
           <%= render 'staypuft/subnets/drop_zone', :subnet => subnet, :deployment => @deployment %>
         <% end %>
       </div>
     </div>
 
-    <br />
-
-    <%= form_for(@deployment, :url => wizard_path, :method => 'PUT', :html => {:class => ''}) do |f| %>
-      <div class="form_actions">
-        <a class="btn btn-default" href="<%= previous_wizard_path %>">
-          <span class="glyphicon glyphicon-chevron-left"></span>
-          <%= _("Back") %>
-        </a>
-        <%= link_to _("Cancel"), deployment_path(@deployment),
-                    :class => "btn btn-danger" %>
-        <%= button_tag(:type => 'submit', :class => "btn btn-primary pull-right") do %>
-          <%= _("Next") %>
+    <div class="row">
+      <div class="col-sm-12">
+        <%= form_for(@deployment, :url => wizard_path, :method => 'PUT', :html => {:class => ''}) do |f| %>
+          <div class="form_actions">
+            <a class="btn btn-default" href="<%= previous_wizard_path %>">
+              <span class="glyphicon glyphicon-chevron-left"></span>
+              <%= _("Back") %>
+            </a>
+            <%= link_to _("Cancel"), deployment_path(@deployment),
+                        :class => "btn btn-danger" %>
+            <%= button_tag(:type => 'submit', :class => "btn btn-primary pull-right") do %>
+              <%= _("Next") %>
+            <% end %>
+          </div>
         <% end %>
       </div>
-    <% end %>
+    </div>
   </div>
 <% end %>

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

@@ -14,7 +14,7 @@
           %>
             <li class="">
               <a href="#<%= service_name  %>" data-toggle="tab">
-                <%= service_name.capitalize %>
+                <%= service_name.capitalize %><span style="visibility: hidden" class ="glyphicon glyphicon-exclamation-sign" />
               </a>
             </li>
             <% end %>

data/app/views/staypuft/subnet_typings/destroy.js.erb

@@ -1,6 +1,6 @@
 <% if @destroyed %>
   $('#<%= dom_id(@subnet_type) %>').remove();
-  $("#subnet_types").append('<%=j render :partial => 'staypuft/subnet_types/subnet_type_pull',
+  $("#subnet_types .panel-body").append('<%=j render :partial => 'staypuft/subnet_types/subnet_type_pull',
       :object => @subnet_type,
       :locals => { :deployment => @deployment },
       :as => 'subnet_type' %>');

data/app/views/staypuft/subnets/_drop_zone.html.erb

@@ -1,9 +1,9 @@
-<div class="subnet-drop-zone" id="<%= dom_id(subnet) %>_drop_zone" data-subnet-id="<%= subnet.id %>">
-  <div class="name">
-    <%= subnet.name %> - <%= subnet.network_address %>
+<div class="subnet-drop-zone panel panel-default" id="<%= dom_id(subnet) %>_drop_zone" data-subnet-id="<%= subnet.id %>">
+  <div class="panel-heading">
+    <h3 class="panel-title"><%= subnet.name %> <small>- <%= subnet.network_address %></small></h3>
   </div>
 
-  <div class="subnet-types">
+  <div class="panel-body subnet-types">
     <% deployment.subnet_typings.where(["#{Staypuft::SubnetTyping.table_name}.subnet_id = ?", subnet.id]).each do |typing| %>
     <%= render :partial => 'staypuft/subnet_types/subnet_type_pull',
                :object => typing.subnet_type,
@@ -11,6 +11,6 @@
                :as => :subnet_type %>
     <% end %>
 
-    <div class="empty-zone"></div>
+    <div class="empty-zone">&nbsp;</div>
   </div>
 </div>

data/app/views/staypuft/subnets/_subnet_pull.html.erb

@@ -2,8 +2,7 @@
      id="<%= dom_id(subnet) %>"
      data-create-url="<%= deployment_interface_assignments_path(deployment, :host_ids => params[:host_ids], :subnet_id => subnet) %>"
      data-delete-url="<%= deployment_interface_assignment_path(deployment, 0, :host_ids => params[:host_ids], :subnet_id => subnet) %>">
-  <div class="content">
-    <div class="name"><%= subnet.name %> <%= '(vlan: ' + subnet.vlanid + ')' if subnet.vlanid.present? %></div>
-    <div class="subnet-types"><%= subnet_types(deployment, subnet) %></div>
-  </div>
+  <strong><%= subnet.name %> <%= '(vlan: ' + subnet.vlanid + ')' if subnet.vlanid.present? %></strong>
+  <br/>
+  <small class="text-muted"><%= subnet_types(deployment, subnet) %></small>
 </div>

data/lib/staypuft/engine.rb

@@ -33,6 +33,8 @@ module Staypuft
       ::Host::Managed.send :include, Staypuft::Concerns::HostDetailsHelper
       ::Host::Discovered.send :include, Staypuft::Concerns::HostOpenStackAffiliation
       ::Puppetclass.send :include, Staypuft::Concerns::PuppetclassExtensions
+      ::Nic::Base.send :include, Staypuft::Concerns::SubnetIpManagement
+      ::Nic::Base.send :include, Staypuft::Concerns::VipNicScopes
       ::Hostgroup.send :include, Staypuft::Concerns::HostgroupExtensions
       ::Environment.send :include, Staypuft::Concerns::EnvironmentExtensions
       ::LookupKey.send :include, Staypuft::Concerns::LookupKeyExtensions

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
@@ -105,19 +105,20 @@ files:
 - app/models/staypuft/deployment/vlan_range_values_validator.rb
 - app/models/staypuft/deployment/nova_service.rb
 - app/models/staypuft/deployment/cinder_service.rb
-- app/models/staypuft/deployment/ips.rb
 - app/models/staypuft/deployment/abstract_param_scope.rb
+- app/models/staypuft/deployment/cinder_service/equallogic.rb
 - app/models/staypuft/deployment/neutron_service.rb
 - app/models/staypuft/deployment/glance_service.rb
 - app/models/staypuft/deployment/attribute_param_storage.rb
-- app/models/staypuft/deployment/vips.rb
 - app/models/staypuft/deployment/passwords.rb
 - app/models/staypuft/service_class.rb
 - app/models/staypuft/subnet_type.rb
 - app/models/staypuft/layout.rb
+- app/models/staypuft/concerns/vip_nic_scopes.rb
 - app/models/staypuft/concerns/hostgroup_extensions.rb
 - app/models/staypuft/concerns/puppetclass_extensions.rb
 - app/models/staypuft/concerns/host_details_helper.rb
+- app/models/staypuft/concerns/subnet_ip_management.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
@@ -153,6 +154,7 @@ files:
 - app/views/staypuft/steps/_neutron_non_ha.html.erb
 - app/views/staypuft/steps/services_overview.html.erb
 - app/views/staypuft/steps/network_configuration.html.erb
+- app/views/staypuft/steps/_cinder_equallogic_form.html.erb
 - app/views/staypuft/steps/_nova_non_ha.html.erb
 - app/views/staypuft/steps/_title.html.erb
 - app/views/staypuft/steps/services_configuration.html.erb

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

@@ -1,25 +0,0 @@
-module Staypuft
-  class Deployment::IPS < Deployment::AbstractParamScope
-
-    class Jail < Safemode::Jail
-      allow :controller_ip, :controller_ips, :controller_fqdns
-    end
-
-    def controllers
-      @controllers ||= deployment.controller_hostgroup.hosts.order(:id)
-    end
-
-    def controller_ips
-      controllers.map &:ip
-    end
-
-    def controller_fqdns
-      controllers.map &:fqdn
-    end
-
-    def controller_ip
-      controllers.tap { |v| v.size == 1 or raise }.first.ip
-    end
-
-  end
-end

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

@@ -1,40 +0,0 @@
-module Staypuft
-  class Deployment::VIPS < Deployment::AbstractParamScope
-
-    VIP_NAMES = [:ceilometer, :cinder, :db, :glance, :heat, :heat_cfn, :horizon, :keystone, :loadbalancer,
-                 :nova, :neutron, :amqp, :swift]
-    COUNT     = VIP_NAMES.size
-
-    def self.param_scope
-      'vips'
-    end
-
-    param_attr :user_range
-
-    HUMAN = N_('Virtual IP addresses range')
-
-    class Jail < Safemode::Jail
-      allow :get
-    end
-
-    def range
-      (user_range || default_range)
-      # TODO reserve the IP addresses
-    end
-
-    # TODO validate range that it is array with size 11 and that it contains only IPS
-
-    def default_range
-      @default_range ||= begin
-        top_ip = hostgroup.subnet.to.split('.').map &:to_i
-        ((top_ip[-1]-(COUNT-1))..top_ip[-1]).
-            map { |last| [*top_ip[0..2], last] }.
-            map { |ip| ip.join '.' }
-      end
-    end
-
-    def get(name)
-      range[VIP_NAMES.index(name) || raise(ArgumentError, "unknown #{name}")]
-    end
-  end
-end