staypuft 0.0.13 → 0.0.14

data/app/controllers/staypuft/deployments_controller.rb

@@ -7,12 +7,6 @@ module Staypuft
     end
 
     def new
-      if Deployment.first
-        flash[:warning] = _('Deployment already exists.')
-        redirect_to deployments_url
-        return
-      end
-
       base_hostgroup = Hostgroup.get_base_hostgroup
 
       deployment           = Deployment.new(:name => Deployment::NEW_NAME_PREFIX+SecureRandom.hex)
@@ -24,16 +18,18 @@ module Staypuft
       deployment.hostgroup = deployment_hostgroup
       deployment.save!
 
-      redirect_to deployment_steps_path
+      redirect_to deployment_steps_path(deployment_id: deployment)
     end
 
     def show
       @deployment = Deployment.find(params[:id])
+      @hostgroup  = ::Hostgroup.find_by_id(params[:hostgroup_id]) ||
+          @deployment.child_hostgroups.deploy_order.first
     end
 
     def summary
-      @deployment = Deployment.find(params[:id])
-      @services   = @deployment.services
+      @deployment            = Deployment.find(params[:id])
+      @service_hostgroup_map = @deployment.services_hostgroup_map
     end
 
     def destroy
@@ -42,21 +38,23 @@ module Staypuft
     end
 
     def deploy
-      task = ForemanTasks.async_task ::Actions::Staypuft::Deployment::Deploy, Deployment.first
+      deployment = Deployment.find(params[:id])
+      task       = ForemanTasks.async_task ::Actions::Staypuft::Deployment::Deploy, deployment
       redirect_to foreman_tasks_task_url(id: task)
     end
 
     # TODO remove, it's temporary
     def populate
       task = ForemanTasks.async_task ::Actions::Staypuft::Deployment::Populate,
-                                     Deployment.first,
+                                     Deployment.find(params[:id]),
                                      fake:   !!params[:fake],
                                      assign: !!params[:assign]
       redirect_to foreman_tasks_task_url(id: task)
     end
 
     def associate_host
-      hostgroup = ::Hostgroup.find params[:hostgroup_id]
+      deployment = Deployment.find(params[:id])
+      hostgroup  = ::Hostgroup.find params[:hostgroup_id]
 
       targeted_hosts  = ::Host::Base.find Array(params[:host_ids])
       assigned_hosts  = hostgroup.hosts
@@ -82,7 +80,8 @@ module Staypuft
         host.save!
       end
 
-      redirect_to deployment_path(id: ::Staypuft::Deployment.first)
+      redirect_to show_with_hostgroup_selected_deployment_path(
+                      id: deployment, hostgroup_id: hostgroup)
     end
 
     private

data/app/controllers/staypuft/{deployment_steps_controller.rb → steps_controller.rb}

@@ -1,5 +1,5 @@
 module Staypuft
-  class DeploymentStepsController < ApplicationController
+  class StepsController < ApplicationController
     include Wicked::Wizard
     steps :deployment_settings, :services_selection, :services_configuration
 
@@ -10,7 +10,7 @@ module Staypuft
       when :deployment_settings
         @layouts = ordered_layouts
       when :services_configuration
-        @services = @deployment.services.order(:name)
+        @service_hostgroup_map = @deployment.services_hostgroup_map
       end
 
       render_wizard
@@ -31,7 +31,7 @@ module Staypuft
         @deployment.form_step = Deployment::STEP_SELECTION unless @deployment.form_complete?
       when :services_configuration
         # Collect services across all deployment's roles
-        @services = @deployment.services.order(:name)
+        @service_hostgroup_map = @deployment.services_hostgroup_map
         if params[:staypuft_deployment]
           @deployment.form_step = Deployment::STEP_CONFIGURATION unless @deployment.form_complete?
           param_data = params[:staypuft_deployment][:hostgroup_params]
@@ -52,7 +52,7 @@ module Staypuft
 
     private
     def get_deployment
-      @deployment      = Deployment.first
+      @deployment      = Deployment.find(params[:deployment_id])
       @deployment.name = nil if @deployment.name.starts_with?(Deployment::NEW_NAME_PREFIX)
     end
 

data/app/lib/actions/staypuft/host/deploy.rb

@@ -32,12 +32,14 @@ module Actions
         end
 
         def humanized_output
-          # TODO: fix dynflow to allow better progress getting
+          # TODO: use Action::Progress.calculate in new dynflow version
           steps    = planned_actions.inject([]) { |s, a| s + a.steps[1..2] }.compact
           progress = if steps.empty?
                        'done'
                      else
-                       format '%3d%%', steps.map(&:progress_done).reduce(&:+) / steps.size * 100
+                       total          = steps.map { |s| s.progress_done * s.progress_weight }.reduce(&:+)
+                       weighted_count = steps.map(&:progress_weight).reduce(&:+)
+                       format '%3d%%', total / weighted_count * 100
                      end
           format '%s Host: %s', progress, input[:host][:name]
         end

data/app/lib/actions/staypuft/host/wait_until_host_ready.rb

@@ -31,6 +31,14 @@ module Actions
           external_task
         end
 
+        def run_progress_weight
+          4
+        end
+
+        def run_progress
+          0.1
+        end
+
         private
 
         def invoke_external_task
@@ -73,6 +81,7 @@ module Actions
             fail(::Staypuft::Exception, "Latest Puppet Run Contains Failures for Host: #{id}")
           end
         end
+
       end
     end
   end

data/app/lib/actions/staypuft/host/wait_until_installed.rb

@@ -38,6 +38,14 @@ module Actions
           plan_self host_id: host_id
         end
 
+        def run_progress_weight
+          4
+        end
+
+        def run_progress
+          0.1
+        end
+
       end
     end
   end

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

@@ -6,7 +6,7 @@ module Staypuft::Concerns::HostgroupExtensions
     has_one :parent_deployment, :through => :deployment_role_hostgroup, :class_name => 'Staypuft::Deployment'
     has_one :role, :through => :deployment_role_hostgroup, :class_name => 'Staypuft::Role'
 
-    has_one :deployment, :class_name => 'Staypuft::Deployment'
+    has_one :deployment, :class_name => 'Staypuft::Deployment', through: :deployment_role_hostgroup
 
     scope :deploy_order,
           lambda { reorder "#{::Staypuft::DeploymentRoleHostgroup.table_name}.deploy_order" }

data/app/models/staypuft/deployment.rb

@@ -2,12 +2,12 @@ module Staypuft
   class Deployment < ActiveRecord::Base
 
     # Form step states
-    STEP_INACTIVE =      :inactive
-    STEP_SETTINGS =      :settings
+    STEP_INACTIVE      = :inactive
+    STEP_SETTINGS      = :settings
     STEP_CONFIGURATION = :configuration
-    STEP_COMPLETE =      :complete
-    STEP_SELECTION =     :selection
-    
+    STEP_COMPLETE      = :complete
+    STEP_SELECTION     = :selection
+
     NEW_NAME_PREFIX="uninitialized_"
 
     attr_accessible :description, :name, :layout_id, :layout
@@ -104,6 +104,14 @@ module Staypuft
       end
     end
 
+    def services_hostgroup_map
+      deployment_role_hostgroups.map do |deployment_role_hostgroup|
+        deployment_role_hostgroup.services.reduce({}) do |h, s|
+          h.update s => deployment_role_hostgroup.hostgroup
+        end
+      end.reduce(&:merge)
+    end
+
     def deployed?
       self.hosts.any?(&:open_stack_deployed?)
     end

data/app/models/staypuft/deployment_role_hostgroup.rb

@@ -5,6 +5,7 @@ module Staypuft
     belongs_to :deployment
     belongs_to :hostgroup
     belongs_to :role
+    has_many :services, :through => :role
 
     validates :deployment, :presence => true
     validates :role, :presence => true

data/app/models/staypuft/service.rb

@@ -11,7 +11,7 @@ module Staypuft
 
     validates :name, :presence => true, :uniqueness => true
 
-    def ui_params_for_form(hostgroup = self.hostgroups.first)
+    def ui_params_for_form(hostgroup)
       return [] if (hostgroup.nil?)
       if hostgroup.puppetclasses.blank?
         params_from_hash = []

data/app/overrides/hide_subscription_manager_passwords.rb

@@ -0,0 +1,7 @@
+Deface::Override.new(:virtual_path => "common_parameters/_inherited_parameters",
+                     :name => "hide_subscription_manager_passwords",
+                     :surround => 'td.col-md-7 erb[loud]:contains("parameter_value_field inherited_parameters[name]")',
+                     :original => '<%= parameter_value_field inherited_parameters[name] %>',
+                     :text => "<% if name == 'subscription_manager_password' %>*****<% else %><%= render_original %><% end %>"
+                     )
+

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

@@ -1,5 +1,9 @@
 <% title _("OpenStack Deployments") %>
+
+<% title_actions display_link_if_authorized(_("New Deployment"), hash_for_new_deployment_path, :class => 'btn-success'), help_path %>
+
 <% if @deployments.present? %>
+
   <table class="table table-bordered table-striped">
     <tr>
       <th><%= sort :name, :as => _('Deployment Name') %></th>
@@ -15,12 +19,13 @@
     <% end %>
   </table>
   <%= page_entries_info @deployments %>
-  <%= will_paginate     @deployments %>
+  <%= will_paginate @deployments %>
+
 <% else %>
-<% title_actions display_link_if_authorized(_("New Deployment"), hash_for_new_deployment_path, :class => 'btn-success'), help_path %>
 
-<%= alert :header => _('There are no deployments yet.'),
-          :text   => _('Please create at least one Deployment.'),
-          :close  => false,
-          :class  => 'alert-info' %>
+  <%= alert :header => _('There are no deployments yet.'),
+            :text   => _('Please create at least one Deployment.'),
+            :close  => false,
+            :class  => 'alert-info' %>
+
 <% end %>

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

@@ -3,9 +3,9 @@
 <% content_for(:title_actions) do %>
 
   <%= link_to(_("Edit"), if @deployment.deployed?
-                           deployment_step_path(id: 'services_configuration')
+                           deployment_step_path(deployment_id: @deployment, id: 'services_configuration')
                          else
-                           deployment_steps_path
+                           deployment_steps_path(deployment_id: @deployment)
                          end) %>
   <%= link_to(_("Configuration Summary"), summary_deployment_path(@deployment.id), :class => '') %>
 
@@ -48,7 +48,7 @@
   <ul class="nav nav-pills nav-stacked col-md-4" data-tabs="pills">
     <h3><%= _("Host Groups") %></h3>
     <% @deployment.child_hostgroups.deploy_order.each_with_index do |child_hostgroup, i| %>
-      <li class="<%= 'active' if i == 0 %>">
+      <li class="<%= 'active' if @hostgroup == child_hostgroup %>">
         <a href="#<%= child_hostgroup.name.parameterize.underscore %>" data-toggle="tab" class="roles_list">
           <div class="col-xs-2 text-center">
             <i class="glyphicon glyphicon-ok"></i>
@@ -71,10 +71,10 @@
 
   <div class="tab-content col-md-8">
     <% @deployment.child_hostgroups.deploy_order.each_with_index do |child_hostgroup, i| %>
-      <div class="tab-pane <%= 'active' if i == 0 %>" id="<%= child_hostgroup.name.parameterize.underscore %>">
+      <div class="tab-pane <%= 'active' if @hostgroup == child_hostgroup %>" id="<%= child_hostgroup.name.parameterize.underscore %>">
         <h3><%= _("Hosts") %></h3>
         <% if child_hostgroup.own_and_free_hosts.present? %>
-          <%= form_tag(associate_host_deployments_path, class: 'form-horizontal well association') do |f| %>
+          <%= form_tag(associate_host_deployment_path(id: @deployment), class: 'form-horizontal well association') do |f| %>
             <p>
               <%= submit_tag _("Assign / Unassign"), :class => "btn btn-primary btn-sm" %>
             </p>

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

@@ -2,10 +2,10 @@
 <% title _("%s Summary") % @deployment.name %>
 
 <div class="col-md-12">
-  <% @services.each_with_index do |service, i| %>
+  <% @service_hostgroup_map.each_with_index do |(service, hostgroup), i| %>
     <div class="well <%= 'active' if i == 0 %>" id="<%= service.name.parameterize.underscore %>">
       <h3><%= "#{service.name} " + _("Service Configuration") %></h3>
-      <% if (params_hash = service.ui_params_for_form).size > 0 %>
+      <% if (params_hash = service.ui_params_for_form(hostgroup)).size > 0 %>
         <% params_hash.each do |param_hash| %>
         <div class="row">
           <div class="col-md-3 text-right">

data/app/views/staypuft/{deployment_steps → steps}/services_configuration.html.erb

@@ -8,7 +8,7 @@
     <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>
-        <% @services.each_with_index do |service, i| %>
+        <% @service_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 %>
@@ -18,10 +18,10 @@
       </ul>
 
       <div class="tab-content col-md-9">
-        <% @services.each_with_index do |service, i| %>
+        <% @service_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).size > 0 %>
+            <% if (params_hash = service.ui_params_for_form(hostgroup)).size > 0 %>
               <% params_hash.each do |param_hash| %>
                 <div class="row">
                   <div class="col-md-4 control-label">

data/config/routes.rb

@@ -3,15 +3,19 @@ Rails.application.routes.draw do
     resources :deployments do
       collection do
         get 'auto_complete_search'
-        post 'associate_host'
       end
       member do
+        match '/hostgroup/:hostgroup_id',
+              :to => 'deployments#show',
+              :as => :show_with_hostgroup_selected, :method => :get
         post 'deploy'
         get 'populate'
         get 'summary'
+        post 'associate_host'
       end
+
+      resources :steps
     end
 
-    resources :deployment_steps
   end
 end

data/lib/staypuft/engine.rb

@@ -1,3 +1,5 @@
+require 'deface'
+
 module Staypuft
   ENGINE_NAME = "staypuft"
   class Engine < ::Rails::Engine
@@ -17,6 +19,9 @@ module Staypuft
           menu :top_menu, :openstack_deployments,
                :url_hash => { :controller => 'staypuft/deployments', :action => :index },
                :caption  => N_('Deployments')
+          menu :top_menu, :new_openstack_deployment,
+               :url_hash => { :controller => 'staypuft/deployments', :action => :new },
+               :caption  => N_('New deployment')
         end
       end
     end

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
@@ -86,8 +86,8 @@ files:
 - app/assets/stylesheets/staypuft/bootstrap_and_overrides.css.scss
 - app/assets/stylesheets/staypuft/staypuft.css.scss
 - app/controllers/staypuft/application_controller.rb
-- app/controllers/staypuft/deployment_steps_controller.rb
 - app/controllers/staypuft/deployments_controller.rb
+- app/controllers/staypuft/steps_controller.rb
 - app/helpers/staypuft/application_helper.rb
 - app/helpers/staypuft/deployments_helper.rb
 - app/lib/actions/staypuft/deployment/deploy.rb
@@ -118,14 +118,15 @@ files:
 - app/models/staypuft/service/ui_params.rb
 - app/models/staypuft/service.rb
 - app/models/staypuft/service_class.rb
-- app/views/staypuft/deployment_steps/_title.html.erb
-- app/views/staypuft/deployment_steps/deployment_settings.html.erb
-- app/views/staypuft/deployment_steps/services_configuration.html.erb
-- app/views/staypuft/deployment_steps/services_selection.html.erb
+- app/overrides/hide_subscription_manager_passwords.rb
 - app/views/staypuft/deployments/index.html.erb
 - app/views/staypuft/deployments/show.html.erb
 - app/views/staypuft/deployments/summary.html.erb
 - app/views/staypuft/layouts/staypuft.html.erb
+- app/views/staypuft/steps/_title.html.erb
+- app/views/staypuft/steps/deployment_settings.html.erb
+- app/views/staypuft/steps/services_configuration.html.erb
+- app/views/staypuft/steps/services_selection.html.erb
 - config/routes.rb
 - config/staypuft.local.rb
 - db/migrate/20140309021811_create_staypuft_layouts.rb