staypuft 0.5.3 → 0.5.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZGUyNWNiM2M0NjZkMTZiMDRiN2ExNjdmNTEzYTU3MDQwY2EzYThlZQ==
+    YWI4ZTliYmU2MjdjNjk0ZDg1Yzk5Yzk3NDg4YjVmMjE1MjYxNjI2OA==
   data.tar.gz: !binary |-
-    NzI0ZTY4Y2UzZGM3MzI2MTU3OTkzMjE0NTU5MmVlMmM5YzU5MTYyMw==
+    NjQ4Y2U3OTJhNmRkZGQ5ZmRhYzg0NzVhMDM5NzAyYzAxZDczYmRmZA==
 SHA512:
   metadata.gz: !binary |-
-    NTEzNjU2YzIyY2JiNDc1MTYzNGZhYzBlNjFkZGI4ZGI5YmY1YTc3MTdjMDBj
-    MTJmZTExNjMwZjZkNGRkMWUzZTM1NzJkZDZkMmRmMWQzZjIxNTI2MWJhZTlk
-    ODU4MWJlYjk5ODEyZTZkM2IzNTBlZGE2ZDc5ZGJhNmMwMTgyYjY=
+    NGU3Y2Q4ODIxMWY5ZWU5NDRkNmRjYjNiMTQwMWNjZGNjY2U0OTg1OGQ2YjI5
+    YTZjMGI3NTc2YzkxMTM5Njk0NDQzYTI0OTA4YTU4ZWQ1ZGY5ODkwZGM4M2Jm
+    MDVlYjgwMzkxZjY3ZDdhZWVhZTgwOWQxZTEyMzQ5NTgzZTYwMGM=
   data.tar.gz: !binary |-
-    MmRlYTkyMDkyOTY1MWViYzgyNDliNzM5ZTdhODYxMmU5NzYwMTE2NGIxYWI2
-    M2JlNGNlZjRhOWI4MTY5MWMwN2ZkMzcwODdlNmJlZTQwYmQxOTA5MjRjZTdh
-    Y2UxNmZiYzZhNzlhYWQ3NWQxN2YwMmIzMjI1YWI4ZTg0YWZiMWQ=
+    NjEyMTlhMDQ5MjgwNjcyZGJiNTU5ZjdhZmU0OWNlZTExY2YwMDYyODM3ODhk
+    ZmZiYjcxMTlhN2IwNzk0ODQ5OGQxODA3YTFjZThmN2M4ZTk3ZjdjOTI0Yzdm
+    MmI4YTljZDllM2JhZjViOWE2MDQwMmZhNGNhZGNkZDFiZTcxNTc=

data/app/assets/stylesheets/staypuft/staypuft.css.scss

@@ -214,3 +214,7 @@ h3[data-toggle="collapse"] {
 .single_password.inset_form {
   margin-left: 192px;
 }
+
+.ui-draggable-dragging {
+  z-index: 1000;
+}

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

@@ -0,0 +1,49 @@
+module Actions
+  module Staypuft
+    module Host
+      class AssertReportSuccess < Dynflow::Action
+
+        middleware.use Actions::Staypuft::Middleware::AsCurrentUser
+
+        def plan(host_id)
+          plan_self host_id: host_id
+        end
+
+        def run(event = nil)
+          case event
+          when Dynflow::Action::Skip
+            output[:status] = true
+          else
+            output[:status] = assert_latest_report_success(input[:host_id])
+          end
+        end
+
+        private
+
+        def assert_latest_report_success(host_id)
+          host   = ::Host.find(host_id)
+          report = host.reports.order('reported_at DESC').first
+
+          unless report
+            fail(::Staypuft::Exception, "No Puppet report found for host: #{host_id}")
+          end
+
+          check_for_failures(report, host_id)
+          report_change?(report)
+        end
+
+        def report_change?(report)
+          report.status['applied'] > 0
+        end
+
+        def check_for_failures(report, host_id)
+          if report.status['failed'] > 0
+            output[:report_id] = report.id
+            fail(::Staypuft::Exception, "Latest Puppet run contains failures for host: #{host_id}")
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -15,20 +15,22 @@ module Actions
     module Host
       class Deploy < Dynflow::Action
 
-        def plan(host)
+        def plan(host, check_success = true)
           Type! host, ::Host::Base
 
           input.update host: { id: host.id, name: host.name }
 
           sequence do
-            plan_action Actions::Staypuft::Host::Update, host, :environment => nil
             puppet_run = plan_action Host::PuppetRun, host
-            plan_action Host::ReportCheck, host.id, puppet_run.output[:executed_at]
+            plan_action Host::ReportWait, host.id, puppet_run.output[:executed_at]
+            if check_success
+              plan_action Host::AssertReportSuccess, host.id
+            end
           end
         end
 
         def task_output
-          steps    = planned_actions(Host::ReportCheck).inject([]) { |s, a| s + a.steps[1..2] }.compact
+          steps    = planned_actions(Host::ReportWait).inject([]) { |s, a| s + a.steps[1..2] }.compact
           progress = if steps.empty?
                        1
                      else

data/app/lib/actions/staypuft/host/{report_check.rb → report_wait.rb}

@@ -14,7 +14,7 @@ module Actions
   module Staypuft
     module Host
 
-      class ReportCheck < Actions::Base
+      class ReportWait < Actions::Base
 
         middleware.use Actions::Staypuft::Middleware::AsCurrentUser
         include Dynflow::Action::Polling
@@ -69,21 +69,7 @@ module Actions
         def host_ready?(host_id, after)
           host   = ::Host.find(host_id)
           report = host.reports.where('reported_at > ?', after).first
-          return false unless report
-
-          check_for_failures(report, host.id)
-          report_change?(report)
-        end
-
-        def report_change?(report)
-          report.status['applied'] > 0
-        end
-
-        def check_for_failures(report, id)
-          if report.status['failed'] > 0
-            output[:report_id] = report.id
-            fail(::Staypuft::Exception, "Latest Puppet Run Contains Failures for Host: #{id}")
-          end
+          return !!report
         end
 
       end

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

@@ -41,18 +41,34 @@ module Actions
 
             input.update hostgroups: {}
             hostgroups.each do |hostgroup|
-              concurrence do
-                input[:hostgroups].update hostgroup.id => { name: hostgroup.name, hosts: {} }
+              input[:hostgroups].update hostgroup.id => { name: hostgroup.name, hosts: {} }
+              hostgroup_hosts = (hostgroup.hosts & hosts_to_deploy_filter)
 
-                (hostgroup.hosts & hosts_to_deploy_filter).each do |host|
+              # wait till all hosts are ready
+              concurrence do
+                hostgroup_hosts.each do |host|
                   input[:hostgroups][hostgroup.id][:hosts].update host.id => host.name
 
-                  sequence do
-                    plan_action Host::WaitUntilReady, host
-                    plan_action Host::Deploy, host
+                  plan_action Host::WaitUntilReady, host
+                  plan_action Host::Update, host, :environment => nil
+                end
+              end
+
+              # run puppet twice without checking for puppet success
+              2.times do
+                concurrence do
+                  hostgroup_hosts.each do |host|
+                    plan_action Host::Deploy, host, false
                   end
                 end
               end
+
+              # run puppet once and check it succeeded
+              concurrence do
+                hostgroup_hosts.each do |host|
+                  plan_action Host::Deploy, host
+                end
+              end
             end
 
             enable_puppet_agent hosts_to_deploy
@@ -87,7 +103,10 @@ module Actions
 
           concurrence do
             hosts.zip(puppet_runs).each do |host, puppet_run|
-              plan_action Actions::Staypuft::Host::ReportCheck, host.id, puppet_run.output[:executed_at]
+              sequence do
+                plan_action Actions::Staypuft::Host::ReportWait, host.id, puppet_run.output[:executed_at]
+                plan_action Actions::Staypuft::Host::AssertReportSuccess, host.id
+              end
             end
           end
         end

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks
@@ -126,10 +126,11 @@ files:
 - 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_check.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