staypuft 0.0.7 → 0.0.8

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

@@ -35,7 +35,7 @@ module Actions
         def restart(host)
           power_management = begin
             host.power
-          rescue Foreman::Exception => e
+          rescue ::Foreman::Exception => e
             if e.code == 'ERF42-9958' # Unknown power management support
               nil
             else

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

@@ -51,17 +51,19 @@ module Actions
                    ::Host::Managed.new(
                        name:         input[:name],
                        hostgroup_id: input[:hostgroup_id],
-                       build:        false,
+                       build:        true,
                        managed:      true,
                        enabled:      true,
+                       environment:  Environment.get_discovery,
                        mac:          '0a:' + Array.new(5).map { format '%0.2X', rand(256) }.join(':'))
                  else
                    ::Host::Managed.new(
                        name:                input[:name],
                        hostgroup_id:        input[:hostgroup_id],
-                       build:               false,
+                       build:               true,
                        managed:             true,
                        enabled:             true,
+                       environment:         Environment.get_discovery,
                        compute_resource_id: input.fetch(:compute_resource_id),
                        compute_attributes:  input[:compute_attributes])
                  end

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

@@ -49,15 +49,28 @@ module Actions
           5
         end
 
+        # TODO The puppet modules sometimes fail then become ready
+        # after subsequent hosts have started.  For this reason
+        # we can not check to see if the host is ready using the
+        # stats on the host only.  This needs fixing in the puppet
+        # modules then reflecting here.
         def host_ready?(host_id)
           host = ::Host.find(host_id)
-          check_for_failures(host)
-          host.skipped == 0 && host.pending == 0
+          host.reports.order('reported_at DESC').any? do |report|
+            #check_for_failures(report, host.id)
+            report_change?(report)
+          end
+        end
+
+        def report_change?(report)
+          report.status['applied'] > 0
         end
 
-        def check_for_failures(host)
-          if host.failed > 0
-            fail(::Staypuft::Exception, "Latest Puppet Run Contains Failures for Host: #{host.id}")
+        # TODO To aid logging add the report ID to the exception or
+        # the output object.
+        def check_for_failures(report, id)
+          if report.status['failed'] > 0
+            fail(::Staypuft::Exception, "Latest Puppet Run Contains Failures for Host: #{id}")
           end
         end
       end

data/app/models/staypuft/layout_role.rb

@@ -8,7 +8,7 @@ module Staypuft
     validates :layout, :presence => true
     validates :role, :presence => true
     validates :role_id, :uniqueness => {:scope => :layout_id}
-    validates  :deploy_order, :presence => true, :uniqueness => {:scope => :layout_id}
+    validates  :deploy_order, :presence => true
 
   end
 end

data/db/seeds.rb

@@ -158,7 +158,8 @@ services = {
   :qpid_ha               => {:name => "qpid (HA)", :class => ["quickstack::pacemaker::qpid",
                                                       "qpid::server"]},
   :glance_ha             => {:name => "Glance (HA)", :class => ["quickstack::pacemaker::glance"]},
-  :nova_ha               => {:name => "Nova (HA)", :class => ["quickstack::pacemaker::nova"]}
+  :nova_ha               => {:name => "Nova (HA)", :class => ["quickstack::pacemaker::nova"]},
+  :ha_db_temp            => {:name => "Database (HA -- temp)", :class => ["quickstack::hamysql::singlenodetest"]}
 }
 services.each do |skey, svalue|
   service = Staypuft::Service.where(:name=>svalue[:name]).first_or_create!
@@ -194,7 +195,7 @@ end
 roles = [
     {:name=>"Controller (Nova)",
      :class=>"quickstack::nova_network::controller",
-     :layouts=>[[:non_ha_nova, 1]],
+     :layouts=>[[:non_ha_nova, 2]],
      :services=>[:non_ha_qpid, :mysql, :non_ha_keystone, :nova_controller, :non_ha_glance, :cinder, :heat, :ceilometer]},
     {:name=>"Compute (Nova)",
      :class=>"quickstack::nova_network::compute",
@@ -202,7 +203,7 @@ roles = [
      :services=>[:nova_compute]},
     {:name=>"Controller (Neutron)",
      :class=>"quickstack::neutron::controller",
-     :layouts=>[[:non_ha_neutron, 1]],
+     :layouts=>[[:non_ha_neutron, 2]],
      :services=>[:non_ha_qpid, :mysql, :non_ha_keystone, :neutron_controller, :non_ha_glance, :cinder, :heat, :ceilometer]},
     {:name=>"Compute (Neutron)",
      :class=>"quickstack::neutron::compute",
@@ -210,11 +211,11 @@ roles = [
      :services=>[:neutron_compute, :neutron_ovs_agent]},
     {:name=>"Neutron Networker",
      :class=>"quickstack::neutron::networker",
-     :layouts=>[[:non_ha_neutron, 2]],
+     :layouts=>[[:non_ha_neutron, 3]],
      :services=>[:neutron_l3, :dhcp, :ovs]},
     {:name=>"LVM Block Storage",
      :class=>"quickstack::storage_backend::lvm_cinder",
-     :layouts=>[[:ha_nova, 3], [:ha_neutron, 3], [:non_ha_nova, 3], [:non_ha_neutron, 3]],
+     :layouts=>[[:ha_nova, 1], [:ha_neutron, 1], [:non_ha_nova, 1], [:non_ha_neutron, 1]],
      :services=>[:cinder]},
     {:name=>"Swift Storage Node",
      :class=>"quickstack::swift::storage",
@@ -222,12 +223,17 @@ roles = [
      :services=>[:swift]},
     {:name=>"HA Controller (Nova)",
      :class=>[],
-     :layouts=>[[:ha_nova, 1]],
+     :layouts=>[[:ha_nova, 3]],
      :services=>[:ha_controller, :keystone_ha, :load_balancer_ha, :memcached_ha, :qpid_ha, :glance_ha, :nova_ha]},
     {:name=>"HA Controller (Neutron)",
      :class=>[],
-     :layouts=>[[:ha_neutron, 1]],
-     :services=>[]}
+     :layouts=>[[:ha_neutron, 2]],
+     :services=>[]},
+         # this one is temporary -- goes away once db is added back to HA COntroller
+    {:name=>"HA Database (temporary)",
+     :class=>[],
+     :layouts=>[[:ha_nova, 2]],
+     :services=>[:ha_db_temp]}
         ]
 
 roles.each do |r|

data/lib/staypuft/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks