kafo 0.0.5 → 0.0.6

data/README.md

@@ -289,6 +289,22 @@ bin/foreman-installer --foreman-db-password=UNDEF
 
 It also works in interactive mode.
 
+## Order of puppet modules execution
+
+When you have more than one module you may end up in situation where you need
+specific order of execution. It seems as a puppet antipattern to me however
+there may be cases where it's needed. You can set order in config/kafo.yaml
+like this
+
+```yaml
+order:
+  - foreman
+  - foreman_proxy
+```
+
+If you have other modules in your answer file they will be executed after
+those that have explicit order. Their order is not be specified.
+
 ## Changing of log directory and user/group
 
 By default kafo logs every run to a separate file in /var/log/kafo.

data/config/kafo.yaml.example

@@ -9,6 +9,7 @@
 ## Kafo tuning, customization of core functionality
 # :no_prefix: false
 # :mapping: {}
+# :order:
 
 ## Advanced configuration - if not set it's ignored
 # :log_owner: root

data/lib/kafo/kafo_configure.rb

@@ -142,10 +142,16 @@ class KafoConfigure < Clamp::Command
         begin
           stdin.each { |line| puppet_log(line) }
         rescue Errno::EIO
-          exit_code = PTY.check(pid).exitstatus
+          if PTY.respond_to?(:check) # ruby >= 1.9.2
+            exit_code = PTY.check(pid).exitstatus
+          else # ruby < 1.9.2
+            Process.wait(pid)
+            exit_code = $?.exitstatus
+          end
         end
       end
-    rescue PTY::ChildExited
+    rescue PTY::ChildExited => e
+      exit_code = e.status.exitstatus
     end
     logger.info "Puppet has finished, bye!"
     exit(exit_code)

data/lib/kafo/version.rb

@@ -1,3 +1,3 @@
 module Kafo
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/modules/kafo_configure/lib/puppet/parser/functions/kafo_ordered.rb

@@ -0,0 +1,21 @@
+# Orders modules names according to kafo.yaml
+#
+# if order was specified we take all modules in this order, if there are
+# other modules that were not ordered, we put them at the end in non-specified
+# order
+module Puppet::Parser::Functions
+  newfunction(:kafo_ordered, :type => :rvalue) do |args|
+    order = YAML.load_file('config/kafo.yaml')[:order]
+    if order.nil?
+      args[0]
+    else
+      result = []
+      base = args[0].clone
+      order.each do |name|
+        result<< base.delete(name)
+      end
+      result + base
+    end
+  end
+end
+

data/modules/kafo_configure/manifests/init.pp

@@ -12,7 +12,7 @@ class kafo_configure(
   $params   = loadanyyaml($answers,
                       "/etc/kafo-configure/answers.yaml",
                       "config/answers.yaml")
-  $keys     = hash_keys($params)
+  $keys     = kafo_ordered(hash_keys($params))
 
   kafo_configure::yaml_to_class { $keys: }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -162,6 +162,7 @@ files:
 - modules/kafo_configure/lib/puppet/parser/functions/dump_values.rb
 - modules/kafo_configure/lib/puppet/parser/functions/load_kafo_password.rb
 - modules/kafo_configure/lib/puppet/parser/functions/hash_keys.rb
+- modules/kafo_configure/lib/puppet/parser/functions/kafo_ordered.rb
 - modules/kafo_configure/lib/puppet/parser/functions/loadanyyaml.rb
 - modules/kafo_configure/manifests/yaml_to_class.pp
 - modules/kafo_configure/manifests/init.pp