staypuft 0.1.22 → 0.2.0

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

@@ -5,14 +5,18 @@ module Staypuft
     end
 
     NFS_HELP = N_('(<server>:<local path>)')
+    BACKEND_FILE = 'file'
+    BACKEND_RBD  = 'rbd'
 
     param_attr :driver_backend, :nfs_network_path
 
     module DriverBackend
       LOCAL   = 'local'
       NFS     = 'nfs'
+      CEPH    = 'ceph'
       LABELS  = { LOCAL   => N_('Local File'),
-                  NFS     => N_('NFS') }
+                  NFS     => N_('NFS'),
+                  CEPH    => N_('Ceph') }
       TYPES   = LABELS.keys
       HUMAN   = N_('Choose Driver Backend')
     end
@@ -30,17 +34,17 @@ module Staypuft
     # TODO: network_path validation
 
     class Jail < Safemode::Jail
-      allow :driver_backend, :pcmk_fs_device, :pcmk_fs_options
+      allow :driver_backend, :pcmk_fs_type, :pcmk_fs_device, :pcmk_fs_options, :backend,
+            :pcmk_fs_manage
     end
 
     def set_defaults
       self.driver_backend = DriverBackend::LOCAL
     end
 
-    # gluster config only shows up for HA
-    # glance UI is HA only until we add ceph (since there's only one option for non-HA)
+    # glance config always shows up
     def active?
-      deployment.ha?
+      true
     end
 
     def local_backend?
@@ -51,6 +55,20 @@ module Staypuft
       self.driver_backend == DriverBackend::NFS
     end
 
+    def ceph_backend?
+      self.driver_backend == DriverBackend::CEPH
+    end
+
+    def backend
+      ceph_backend? ? BACKEND_RBD : BACKEND_FILE
+    end
+
+    def pcmk_fs_type
+      if self.nfs_backend?
+        self.driver_backend
+      end
+    end
+
     def pcmk_fs_device
       if self.nfs_backend?
         self.nfs_network_path
@@ -59,22 +77,28 @@ module Staypuft
 
     def pcmk_fs_options
       if self.nfs_backend?
-        'context=\"system_u:object_r:glance_var_lib_t:s0\"'
+        'nosharecache,context=\"system_u:object_r:glance_var_lib_t:s0\"'
       else
         ''
       end
     end
 
+    def pcmk_fs_manage
+      backend == BACKEND_FILE
+    end
+
     # view should use this rather than DriverBackend::LABELS to hide LOCAL for HA.
     def backend_labels_for_layout
       ret_list = DriverBackend::LABELS.clone
       ret_list.delete(DriverBackend::LOCAL) if self.deployment.ha?
+      ret_list.delete(DriverBackend::NFS)   if self.deployment.non_ha?
       ret_list
     end
 
     def backend_types_for_layout
       ret_list = DriverBackend::TYPES.clone
       ret_list.delete(DriverBackend::LOCAL) if self.deployment.ha?
+      ret_list.delete(DriverBackend::NFS)   if self.deployment.non_ha?
       ret_list
     end
 

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

@@ -6,7 +6,7 @@ module Staypuft
 
     SEGMENTATION_LIST = ['vxlan', 'vlan', 'gre', 'flat']
     INTERFACE_HELP    = N_('(e.g. eth0 or em1)')
-    VLAN_HELP         = N_('[1-4094] (e.g. 10:100)')
+    VLAN_HELP         = N_('[1-4094] (e.g. 10:15)')
 
 
     param_attr :network_segmentation, :tenant_vlan_ranges, :networker_tenant_interface,

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

@@ -1,6 +1,6 @@
 module Staypuft
   module Deployment::VlanRangeValuesValidator
-    GENERAL_MSG = N_("Start and end vlan IDs required, in format '10:100'")
+    GENERAL_MSG = N_("Start and end vlan IDs required, in format '10:15'")
     INT_VAL_MSG = N_("is not a valid integer between 1 and 4094")
     FIRST_VALID = 1
     LAST_VALID = 4024

data/app/views/staypuft/deployments/{summary.html.erb → _advanced_configuration.html.erb}

@@ -1,25 +1,27 @@
-<% title _("%s Configuration Parameters") % @deployment.name %>
-<% content_for(:top_actions) do %>
-  <%= link_to _("Back to Deployment"), deployment_path(@deployment.id), :class => "btn btn-link" %>
-  <%= link_to(icon_text("cloud-upload", _("Import")),
-              {},
-              { :class  => "btn btn-default",
-                :remote => true,
-                :rel    => 'popover',
-                :data   => { 'content'        => "#{render partial: 'import_form'}",
-                             'original-title' => _('Import Config'),
-                             'placement'      => 'left' } }) %>
-  <%= link_to(icon_text("cloud-download", _("Export")),
-              export_config_deployment_path(@deployment.id), :class => "btn btn-default") %>
-  <%= link_to _("Edit"), edit_deployment_path(@deployment.id),
-              :class => @deployment.in_progress? ? %w(btn btn-default disabled) : %w(btn btn-default) %>
-<% end %>
 
+<div class="col-md-12">
+  <div class="pull-right">
+    <%= link_to(icon_text("cloud-upload", _("Import")),
+                {},
+                { :class  => "btn btn-default",
+                  :remote => true,
+                  :rel    => 'popover',
+                  :data   => { 'content'        => "#{render partial: 'import_form'}",
+                               'original-title' => _('Import Config'),
+                               'placement'      => 'left' } }) %>
+    <%= link_to(icon_text("cloud-download", _("Export")),
+                export_config_deployment_path(@deployment.id), :class => "btn btn-default") %>
+    <%= link_to _("Edit"), edit_deployment_path(@deployment.id),
+                :class => @deployment.in_progress? ? %w(btn btn-default disabled) : %w(btn btn-default) %>
+  </div>
+</div>
+<br />
+<br />
 <div class="col-md-12">
   <div class="form-group tabbed_side_nav_form row">
     <ul class="nav nav-pills nav-stacked col-md-3" data-tabs="pills">
       <h3><%= _("Services") %></h3>
-      <% @service_hostgroup_map.each_with_index do |(service, hostgroup), i| %>
+      <% @deployment.services_hostgroup_map.each_with_index do |(service, hostgroup), i| %>
         <li class="<%= 'active' if i == 0 %>">
           <a href="#<%= service.name.parameterize.underscore %>" data-toggle="tab">
             <%= service.name %>
@@ -29,7 +31,7 @@
     </ul>
 
     <div class="tab-content col-md-9">
-      <% @service_hostgroup_map.each_with_index do |(service, hostgroup), i| %>
+      <% @deployment.services_hostgroup_map.each_with_index do |(service, hostgroup), i| %>
         <div class="tab-pane <%= 'active' if i == 0 %>" id="<%= service.name.parameterize.underscore %>">
           <h3><%= "#{service.name} " + _("Service Configuration") %></h3>
           <% if (params_hash = service.ui_params_for_form(hostgroup)).size > 0 %>

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

@@ -0,0 +1,47 @@
+<% if hosts.any? %>
+<div class="" id="table_assigned_hosts">
+  <%= form_tag(associate_host_deployment_path(id: @deployment), class: 'form-horizontal association') do |f| %>
+    <div class="pull-right top_actions">
+      <%= submit_tag _("Configure Networks"), :class => "btn btn-default btn-sm", :style => "visibility: hidden" %>
+      <%= submit_tag _("Unassign Hosts"), :class => "btn btn-primary btn-sm", :style => "visibility: hidden" %>
+    </div>
+    <h4 class="pull-left"><%= _("Assigned Hosts") %></h4>
+    <p class="clearfix"></p>
+    <table class="table table-bordered table-striped table-condensed">
+      <thead>
+        <tr>
+          <th class="ca">
+            <%= tag :input, type: 'checkbox', class: 'check_all' %>
+          </th>
+          <th><%= sort :name, :as => _('Name') %></th>
+          <th class="hidden-s hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% hosts.each do |host| %>
+          <tr class="checkbox_highlight">
+            <td class="ca">
+              <%= check_box_tag 'host_ids[]',
+                                host.id,
+                                false,
+                                id:       "host_ids_#{host.id}" %>
+            </td>
+            <td class="ellipsis">
+             <%= host_label(host) %>
+            </td>
+            <td class="hidden-s hidden-xs"><%= host.ip %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  <% end %>
+</div>
+<% else %>
+  <div class="association">
+    <h4><%= _("Assigned Hosts") %></h4>
+    <div class="alert alert-warning">
+      <span class="glyphicon glyphicon-warning-sign">&nbsp;</span>
+      <%= _("There are no currently assigned hosts.") %>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,47 @@
+<% if hosts.any? %>
+<div class="" id="table_deployed_hosts">
+  <%= form_tag(associate_host_deployment_path(id: @deployment), class: 'form-horizontal association') do |f| %>
+    <div class="pull-right top_actions">
+      <%= submit_tag _("Undeploy Hosts"), :class => "btn btn-primary btn-smt",
+          :style => "visibility: hidden" %>
+    </div>
+    <h4 class="pull-left"><%= _("Deployed Hosts") %></h4>
+    <p class="clearfix"></p>
+    <table class="table table-bordered table-striped table-condensed">
+      <thead>
+        <tr>
+          <th class="ca">
+            <%= tag :input, type: 'checkbox', class: 'check_all' %>
+          </th>
+          <th><%= sort :name, :as => _('Name') %></th>
+          <th class="hidden-s hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% hosts.each do |host| %>
+          <tr class="checkbox_highlight">
+            <td class="ca">
+              <%= check_box_tag 'host_ids[]',
+                                host.id,
+                                false,
+                                id:       "host_ids_#{host.id}" %>
+            </td>
+            <td class="ellipsis">
+             <%= host_label(host) %>
+            </td>
+            <td class="hidden-s hidden-xs"><%= host.ip %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  <% end %>
+</div>
+<% else %>
+  <div class="association">
+    <h4><%= _("Deployed Hosts") %></h4>
+    <div class="alert alert-warning">
+      <span class="glyphicon glyphicon-warning-sign">&nbsp;</span>
+      <%= _("There are no currently deployed hosts.") %>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,21 @@
+<% deployed_hosts = @deployment.hosts.select { |h| h.open_stack_deployed? } %>
+<% assigned_hosts = @deployment.hosts.select { |h| !h.open_stack_deployed? } %>
+<% free_hosts = ::Host.where("hostgroup_id IS NULL") %>
+
+<% sub_nav = [ {:title => "#{_('Deployed')} (#{deployed_hosts.count})", :target_id => '#deployed-hosts', :class => "inner-nav", :active => true},
+               {:title => "#{_('Assigned')} (#{assigned_hosts.count})", :target_id => '#assigned-hosts', :class => "inner-nav"},
+               {:title => "#{_('Free')} (#{free_hosts.count})", :target_id => '#free-hosts', :class => "inner-nav"} ] %>
+
+<%= tabbed_nav_menu(sub_nav, 'hosts-navigation', 'nav nav-tabs inner-nav', 'sub-tab') %>
+
+<div id="hosts-navigation-tabs"  class="tab-content">
+  <div class="tab-pane active in" id="deployed-hosts">
+    <%= render :partial => "deployed_hosts", :locals => { :hosts => deployed_hosts } %>
+  </div>
+  <div class="tab-pane" id="assigned-hosts">
+    <%= render :partial => "assigned_hosts", :locals => { :hosts => assigned_hosts } %>
+  </div>
+  <div class="tab-pane" id="free-hosts">
+    <%= render :partial => "free_hosts", :locals => { :hosts => free_hosts } %>
+  </div>
+</div>

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

@@ -0,0 +1 @@
+<h1>TODO: Deployment Networking Tab</h1>

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

@@ -0,0 +1,95 @@
+<div style="width: 100%; display: inline-block;">
+  <%= edit_textfield(@deployment, :description, options={ :update_url => deployment_path(@deployment) }) %>
+</div>
+
+<div class="row tabbed_side_nav_table">
+  <ul class="nav nav-pills nav-stacked col-md-4" data-tabs="pills">
+    <h3><%= _("Deployment Roles") %></h3>
+    <% @deployment.child_hostgroups.deploy_order.each_with_index do |child_hostgroup, i| %>
+      <li>
+        <div class="col-xs-2">
+          <% if child_hostgroup.hosts.select { |h| !ForemanTasks::Lock.locked?(@deployment, nil) && h.open_stack_deployed? }.count > 0 %>
+            <a href="#<%= child_hostgroup.name.parameterize.underscore %>_deployed_hosts" data-toggle="tab" class="roles_list">
+              <span><%= child_hostgroup.hosts.select { |h| !ForemanTasks::Lock.locked?(@deployment, nil) && h.open_stack_deployed? }.count %></span>
+            </a>
+          <% else %>
+            <span><%= child_hostgroup.hosts.select { |h| !ForemanTasks::Lock.locked?(@deployment, nil) && h.open_stack_deployed? }.count %></span>
+          <% end %>
+        </div>
+        <div class="col-xs-6">
+          <div class="group_name">
+            <%= child_hostgroup.name %>
+          </div>
+        </div>
+        <div class="col-xs-2">
+          <% if child_hostgroup.hosts.select { |h| !(!ForemanTasks::Lock.locked?(@deployment, nil) && h.open_stack_deployed?) }.count > 0 %>
+            <a href="#<%= child_hostgroup.name.parameterize.underscore %>_assigned_hosts" data-toggle="tab" class="roles_list">
+              <% unless @deployment.in_progress? %>
+                <i class="glyphicon glyphicon-time"></i>
+              <% else %>
+                <%= image_tag '/assets/spinner.gif' %>
+              <% end %>
+              <span><%= child_hostgroup.hosts.select { |h| !(!ForemanTasks::Lock.locked?(@deployment, nil) && h.open_stack_deployed?) }.count %></span>
+            </a>
+          <% end %>
+        </div>
+        <div class="col-xs-2">
+          <a href="#<%= child_hostgroup.name.parameterize.underscore %>_free_hosts" data-toggle="tab" class="roles_list">
+            <i class="glyphicon glyphicon-plus"></i>
+          </a>
+        </div>
+      </li>
+    <% end %>
+  </ul>
+
+  <div class="tab-content col-md-8">
+    <% @deployment.child_hostgroups.deploy_order.each_with_index do |child_hostgroup, i| %>
+      <%= render :partial => "free_hosts_table", :locals => { :deployment      => @deployment,
+                                                              :hostgroup       => @hostgroup,
+                                                              :child_hostgroup => child_hostgroup } %>
+      <%= render :partial => "assigned_hosts_table", :locals => { :deployment      => @deployment,
+                                                                  :hostgroup       => @hostgroup,
+                                                                  :child_hostgroup => child_hostgroup } %>
+      <%= render :partial => "deployed_hosts_table", :locals => { :deployment      => @deployment,
+                                                                  :hostgroup       => @hostgroup,
+                                                                  :child_hostgroup => child_hostgroup } %>
+    <% end %>
+    <%= render :partial => "deployment_summary", :locals => { :deployment => @deployment } %>
+  </div>
+</div>
+
+<div class="modal fade" id="deploy_modal" tabindex="-1" role="dialog" aria-labelledby="Deploy" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h2 class="modal-title" id="deploy_modal_label">
+          <span class="glyphicon glyphicon-cloud-upload">
+          </span> <%= _("Deploy") %>
+        </h2>
+      </div>
+      <div class="modal-body">
+        <%= (_("This action will initiate the deployment of %s ") % "<strong>#{@deployment.name}</strong>").html_safe %>
+        <div class="deploy-changes">
+          <strong><%= _("Resulting OpenStack Deployment") %>:</strong>
+          <% @deployment.child_hostgroups.deploy_order.each do |child_hostgroup| %>
+            <div <%= "class=text-muted".html_safe if child_hostgroup.hosts.count == 0 %>>
+              <strong><%= "#{child_hostgroup.hosts.count} x" %></strong>
+              <%= "#{child_hostgroup.name}" %>
+            </div>
+          <% end %>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal"><%= _("Cancel") %></button>
+        <%= display_link_if_authorized(_("Deploy"),
+                                       hash_for_deploy_deployment_path,
+                                       :class  => 'btn btn-primary',
+                                       :method => :post,
+                                       :data   => { :disable_with => _("Deploying...") }) %>
+      </div>
+    </div>
+  </div>
+</div>
+
+<%= render :partial => "deployment_access_all_details_dialogue", :locals => { :deployment => @deployment } %>

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

@@ -0,0 +1,44 @@
+<% title(@deployment.name,
+         edit_textfield(@deployment,
+                        :name,
+                        options={ :update_url => deployment_path(@deployment) }) +
+             content_tag(:small,
+                         @deployment.ha? ? _("with High Availability") : _("without High Availability"),
+                         :class => "text-muted")) %>
+
+<% content_for(:top_actions) do %>
+  <%= link_to(_("Deploy"),
+              "",
+              :class         => @deployment.in_progress? ? %w(btn btn-primary disabled) : %w(btn btn-primary),
+              :'data-toggle' => "modal",
+              :'data-target' => "#deploy_modal",
+              :id => "deploy_button") %>
+  <%= link_to(_("Revisit Setup Wizard"),
+              if @deployment.deployed?
+                deployment_step_path(deployment_id: @deployment, id: 'services_configuration')
+              else
+                deployment_steps_path(deployment_id: @deployment)
+              end,
+              :class         => @deployment.in_progress? ? %w(btn btn-default disabled) : %w(btn btn-default)) %>
+
+  <% if Rails.env.development? %>
+    <div class="btn-group">
+      <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+        <%= _('Populate with') %>
+        <span class="caret"></span>
+      </button>
+      <ul class="dropdown-menu" role="menu">
+        <li>
+          <%= display_link_if_authorized(_("Real assigned Hosts"), hash_for_populate_deployment_path(assign: true)) %>
+        </li>
+        <li>
+          <%= display_link_if_authorized(_("Real unassigned Hosts"), hash_for_populate_deployment_path) %>
+        </li>
+        <li>
+          <%= display_link_if_authorized(_("Fake unassigned Hosts"), hash_for_populate_deployment_path(:fake => true)) %>
+        </li>
+      </ul>
+    </div>
+    <%= help_path %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,48 @@
+<% if hosts.exists? %>
+<div class="" id="table_free_hosts">
+  <%= form_tag(associate_host_deployment_path(id: @deployment), class: 'form-horizontal association') do |f| %>
+    <div class="pull-right top_actions">
+      <%= submit_tag _("Configure Networks"), :class => "btn btn-default btn-sm", :style => "visibility: hidden" %>
+      <%= submit_tag _("Assign Hosts"), :class => "btn btn-primary btn-sm",
+                     :style => "visibility: hidden" %>
+    </div>
+    <h4 class="pull-left"><%= _("Free Hosts") %></h4>
+    <p class="clearfix"></p>
+    <table class="table table-bordered table-striped table-condensed">
+      <thead>
+        <tr>
+          <th class="ca">
+            <%= tag :input, type: 'checkbox', class: 'check_all' %>
+          </th>
+          <th><%= sort :name, :as => _('Name') %></th>
+          <th class="hidden-s hidden-xs"><%= sort :ip, :as => _('IP Address') %></th>
+        </tr>
+      </thead>
+      <tbody>
+        <% hosts.each do |host| %>
+          <tr class="checkbox_highlight">
+            <td class="ca">
+              <%= check_box_tag 'host_ids[]',
+                                host.id,
+                                false,
+                                id:       "host_ids_#{host.id}" %>
+            </td>
+            <td class="ellipsis">
+             <%= host_label(host) %>
+            </td>
+            <td class="hidden-s hidden-xs"><%= host.ip %></td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  <% end %>
+</div>
+<% else %>
+  <div class="association">
+    <h4><%= _("Free Hosts") %></h4>
+    <div class="alert alert-warning">
+      <span class="glyphicon glyphicon-warning-sign">&nbsp;</span>
+      <%= _("All available hosts have been already assigned.") %>
+    </div>
+  </div>
+<% end %>