staypuft 0.0.8 → 0.0.9

data/app/controllers/staypuft/deployment_steps_controller.rb

@@ -29,6 +29,7 @@ module Staypuft
         Deployment.transaction do
           @deployment.update_attributes(params[:staypuft_deployment])
           @deployment.update_hostgroup_list
+          @deployment.set_networking_params
         end
       when :services_configuration
         # Collect services across all deployment's roles

data/app/controllers/staypuft/deployments_controller.rb

@@ -13,8 +13,7 @@ module Staypuft
         return
       end
 
-      base_hostgroup = Hostgroup.where(:name => Setting[:base_hostgroup]).first or
-          raise 'missing base_hostgroup'
+      base_hostgroup = Hostgroup.get_base_hostgroup
 
       deployment           = Deployment.new(:name => Deployment::NEW_NAME_PREFIX+SecureRandom.hex)
       deployment.layout    = Layout.where(:name       => "Distributed",
@@ -34,7 +33,7 @@ module Staypuft
 
     def summary
       @deployment = Deployment.find(params[:id])
-      @services = @deployment.services
+      @services   = @deployment.services
     end
 
     def destroy

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

@@ -15,6 +15,7 @@ module Actions
     module Deployment
       class Deploy < Actions::Base
 
+        include Actions::Helpers::Lock
         middleware.use Actions::Staypuft::Middleware::AsCurrentUser
 
         def plan(deployment)
@@ -25,6 +26,8 @@ module Actions
           input.update id: deployment.id, name: deployment.name
 
           plan_action Hostgroup::OrderedDeploy, ordered_hostgroups
+
+          lock! deployment
         end
 
         def humanized_input

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

@@ -51,7 +51,7 @@ module Actions
         end
 
         def restart_with_foreman_proxy(host)
-          host.setReboot # FIXME detect failures
+          host.setReboot
         end
 
         def restart_with_power_management(power)

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

@@ -20,18 +20,26 @@ module Actions
 
           input.update host: { id: host.id, name: host.name }
 
-          sequence do
-            plan_action Host::Build, host.id
-            plan_action Host::WaitUntilInstalled, host.id
-            plan_action Host::WaitUntilHostReady, host.id
+          unless host.open_stack_deployed?
+            sequence do
+              plan_action Host::Build, host.id
+              plan_action Host::WaitUntilInstalled, host.id
+              plan_action Host::WaitUntilHostReady, host.id
+            end
+          else
+            # it is already deployed
           end
         end
 
         def humanized_output
           # TODO: fix dynflow to allow better progress getting
           steps    = planned_actions.inject([]) { |s, a| s + a.steps[1..2] }.compact
-          progress = steps.map(&:progress_done).reduce(&:+) / steps.size
-          format '%3d%% Host: %s', progress * 100, input[:host][:name]
+          progress = if steps.empty?
+                       'done'
+                     else
+                       format '%3d%%', steps.map(&:progress_done).reduce(&:+) / steps.size * 100
+                     end
+          format '%s Host: %s', progress, input[:host][:name]
         end
 
       end

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

@@ -40,6 +40,7 @@ module Actions
           format "Hostgroup: %s\n%s", input[:name],
                  planned_actions.
                      map(&:humanized_output).
+                     compact.
                      tap { |lines| lines << '-' if lines.empty? }.
                      map { |l| '  ' + l }.
                      join("\n")

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

@@ -0,0 +1,18 @@
+module Staypuft
+  module Concerns
+    module HostOpenStackAffiliation
+      extend ActiveSupport::Concern
+
+      def open_stack_deployed?
+        open_stack_assigned? &&
+            respond_to?(:environment) &&
+            environment != Environment.get_discovery
+      end
+
+      def open_stack_assigned?
+        respond_to?(:hostgroup) &&
+            hostgroup.try(:parent).try(:parent) == Hostgroup.get_base_hostgroup
+      end
+    end
+  end
+end

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

@@ -18,6 +18,7 @@ module Staypuft
       def self.cache_id(host_id)
         "host.#{host_id}.wake_up_orchestration"
       end
+
     end
   end
 end

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

@@ -7,44 +7,50 @@ module Staypuft::Concerns::HostgroupExtensions
     has_one :role, :through => :deployment_role_hostgroup, :class_name => 'Staypuft::Role'
 
     has_one :deployment, :class_name => 'Staypuft::Deployment'
+  end
 
-    def add_puppetclasses_from_resource(resource)
-      if resource.respond_to?(:puppetclasses)
-        resource.puppetclasses.each do |puppetclass|
-          unless puppetclasses.include?(puppetclass)
-            puppetclasses << puppetclass
-          end
+  def add_puppetclasses_from_resource(resource)
+    if resource.respond_to?(:puppetclasses)
+      resource.puppetclasses.each do |puppetclass|
+        unless puppetclasses.include?(puppetclass)
+          puppetclasses << puppetclass
         end
       end
     end
+  end
 
-    def current_param_value(key)
-      if (v = LookupValue.where(:lookup_key_id => key.id, :id => lookup_values).first)
-        return v.value, to_label
-      end
-      return inherited_lookup_value(key)
+  def current_param_value(key)
+    if (v = LookupValue.where(:lookup_key_id => key.id, :id => lookup_values).first)
+      return v.value, to_label
     end
+    return inherited_lookup_value(key)
+  end
 
-    def current_param_value_str(key)
-      val = current_param_value(key)[0]
-      val.is_a?(Array) ? val.join(", ") : val
-    end
+  def current_param_value_str(key)
+    val = current_param_value(key)[0]
+    val.is_a?(Array) ? val.join(", ") : val
+  end
 
-    def set_param_value_if_changed(puppetclass, key, value)
-      lookup_key    = puppetclass.class_params.where(:key => key).first
-      current_value = current_param_value(lookup_key)[0]
-      new_value     = current_value.is_a?(Array) ? value.split(", ") : value
-      unless current_value == new_value
-        lookup       = LookupValue.where(:match         => hostgroup.send(:lookup_value_match),
-                                         :lookup_key_id => lookup_key.id).first_or_initialize
-        lookup.value = new_value
-        lookup.save!
-      end
+  def set_param_value_if_changed(puppetclass, key, value)
+    lookup_key    = puppetclass.class_params.where(:key => key).first
+    current_value = current_param_value(lookup_key)[0]
+    new_value     = current_value.is_a?(Array) ? value.split(", ") : value
+    unless current_value == new_value
+      lookup       = LookupValue.where(:match         => hostgroup.send(:lookup_value_match),
+                                       :lookup_key_id => lookup_key.id).first_or_initialize
+      lookup.value = new_value
+      lookup.save!
     end
+  end
+
+  def own_and_free_hosts
+    # TODO update to Discovered only?
+    Host::Base.where('hostgroup_id = ? OR hostgroup_id IS NULL', id)
+  end
 
-    def own_and_free_hosts
-      # TODO update to Discovered only?
-      Host::Base.where('hostgroup_id = ? OR hostgroup_id IS NULL', id)
+  module ClassMethods
+    def get_base_hostgroup
+      Hostgroup.where(:name => Setting[:base_hostgroup]).first or raise 'missing base_hostgroup'
     end
   end
 

data/app/models/staypuft/deployment.rb

@@ -23,6 +23,10 @@ module Staypuft
 
     scoped_search :on => :name, :complete_value => :true
 
+    def self.available_locks
+      [:deploy]
+    end
+
     def destroy
       child_hostgroups.each do |h|
         h.destroy
@@ -42,6 +46,9 @@ module Staypuft
         end
 
         role_hostgroup.hostgroup.add_puppetclasses_from_resource(layout_role.role)
+        layout_role.role.services.each do |service|
+          role_hostgroup.hostgroup.add_puppetclasses_from_resource(service)
+        end
         role_hostgroup.hostgroup.save!
 
         role_hostgroup.deploy_order = layout_role.deploy_order
@@ -55,6 +62,19 @@ module Staypuft
       end
     end
 
+    # If layout networking is set to 'neutron', then set include_neutron on the
+    # hostgroup if it includes the "quickstack::pacemaker::params" puppetclass
+    def set_networking_params
+      child_hostgroups.each do |the_hostgroup|
+        the_hostgroup.puppetclasses.each do |pclass|
+          if pclass.class_params.where(:key=> "include_neutron").first          
+            the_hostgroup.set_param_value_if_changed(pclass, "include_neutron",
+                                     (layout.networking == 'neutron') ? true : false)
+          end
+        end
+      end        
+    end
+
     private
     def update_hostgroup_name
       hostgroup.name = self.name

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

@@ -24,8 +24,18 @@
     </div>
   <% end %>
 
-
-  <%= display_link_if_authorized(_("Deploy"), hash_for_deploy_deployment_path, :class => 'btn-success') %>
+  <% if ForemanTasks::Lock.locked? @deployment, nil %>
+    <%= display_link_if_authorized(
+            _('Deploy in progress'),
+            hash_for_foreman_tasks_task_path(id: ForemanTasks::Lock.colliding_locks(@deployment, nil).first.task.id),
+            :class => 'btn-info') %>
+  <% else %>
+    <%= link_to(_("Deploy"),
+                "",
+                :class => %w(btn btn-success),
+                :'data-toggle' => "modal",
+                :'data-target' => "#deploy_modal") %>
+  <% end %>
   <%= help_path %>
 <% end %>
 
@@ -35,9 +45,18 @@
     <% @deployment.child_hostgroups.each_with_index do |child_hostgroup, i| %>
       <li class="<%= 'active' if i == 0 %>">
         <a href="#<%= child_hostgroup.name.parameterize.underscore %>" data-toggle="tab" class="roles_list">
-          <div class="col-xs-2 text-center"><span class="glyphicon glyphicon-ok"></span><span><%= child_hostgroup.hosts.count %></span></div>
-          <div class="col-xs-2 text-center"><span class="glyphicon glyphicon-warning-sign"></span><span>0</span></div>
-          <div class="col-xs-2 text-center"><span class="glyphicon glyphicon-time"></span><span>0</span></div>
+          <div class="col-xs-2 text-center">
+            <span class="glyphicon glyphicon-ok"></span>
+            <span><%= child_hostgroup.hosts.select { |h| h.open_stack_deployed? && !h.error? }.count %></span>
+          </div>
+          <div class="col-xs-2 text-center">
+            <span class="glyphicon glyphicon-warning-sign"></span>
+            <span><%= child_hostgroup.hosts.select { |h| h.open_stack_deployed? && h.error? }.count %></span>
+          </div>
+          <div class="col-xs-2 text-center">
+            <span class="glyphicon glyphicon-time"></span>
+            <span><%= child_hostgroup.hosts.select { |h| !h.open_stack_deployed? }.count %></span>
+          </div>
           <div class="col-xs-6"><%= child_hostgroup.name %></div>
           <span class="clearfix"></span>
         </a>
@@ -70,7 +89,12 @@
                 <% child_hostgroup.own_and_free_hosts.each do |host| %>
                   <tr class="checkbox_highlight <%= "success" if child_hostgroup.host_ids.include?(host.id) %>">
                     <td class="ca">
-                      <%= check_box_tag "host_ids[]", host.id, child_hostgroup.host_ids.include?(host.id), :id => "host_ids_#{host.id}" %>
+                      <%= check_box_tag 'host_ids[]',
+                                        host.id,
+                                        child_hostgroup.host_ids.include?(host.id),
+                                        :id       => "host_ids_#{host.id}",
+                                        :disabled => host.open_stack_deployed? %>
+                      <%= hidden_field_tag 'host_ids[]', host.id if host.open_stack_deployed? %>
                     </td>
                     <td class="ellipsis"><%= host.name %></td>
                     <td class="hidden-s hidden-xs"><%= host.mac %></td>
@@ -93,3 +117,23 @@
   </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>
+      <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') %>
+      </div>
+    </div>
+  </div>
+</div>

data/db/seeds.rb

@@ -159,6 +159,7 @@ services = {
                                                       "qpid::server"]},
   :glance_ha             => {:name => "Glance (HA)", :class => ["quickstack::pacemaker::glance"]},
   :nova_ha               => {:name => "Nova (HA)", :class => ["quickstack::pacemaker::nova"]},
+  :cinder_ha             => {:name => "Cinder (HA)", :class => ["quickstack::pacemaker::cinder"]},
   :ha_db_temp            => {:name => "Database (HA -- temp)", :class => ["quickstack::hamysql::singlenodetest"]}
 }
 services.each do |skey, svalue|
@@ -224,7 +225,7 @@ roles = [
     {:name=>"HA Controller (Nova)",
      :class=>[],
      :layouts=>[[:ha_nova, 3]],
-     :services=>[:ha_controller, :keystone_ha, :load_balancer_ha, :memcached_ha, :qpid_ha, :glance_ha, :nova_ha]},
+     :services=>[:ha_controller, :keystone_ha, :load_balancer_ha, :memcached_ha, :qpid_ha, :glance_ha, :nova_ha, :cinder_ha]},
     {:name=>"HA Controller (Neutron)",
      :class=>[],
      :layouts=>[[:ha_neutron, 2]],

data/lib/staypuft/engine.rb

@@ -23,6 +23,8 @@ module Staypuft
 
     config.to_prepare do
       ::Host::Managed.send :include, Staypuft::Concerns::HostOrchestrationBuildHook
+      ::Host::Managed.send :include, Staypuft::Concerns::HostOpenStackAffiliation
+      ::Host::Discovered.send :include, Staypuft::Concerns::HostOpenStackAffiliation
       ::Puppetclass.send :include, Staypuft::Concerns::PuppetclassExtensions
       ::Hostgroup.send :include, Staypuft::Concerns::HostgroupExtensions
       ::Environment.send :include, Staypuft::Concerns::EnvironmentExtensions

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
   name: dynflow
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +104,7 @@ files:
 - app/lib/staypuft/exception.rb
 - app/models/setting/staypuft_provisioning.rb
 - app/models/staypuft/concerns/environment_extensions.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/puppetclass_extensions.rb