kafo 0.0.11 → 0.0.12

data/README.md

@@ -297,13 +297,17 @@ paths. In order to do that you can use following configuration options:
 
 * :answer_file: /etc/kafo/kafo.yaml
 * :installer_dir: /usr/share/kafo/
-* :modules_dir: /usr/share/kafo/modules
+* :modules_dir: /usr/share/foreman-installer/modules
+* :kafo_modules_dir: /usr/share/kafo/modules
 
 Answer file is obvious. Installer dir is a place where you installer is 
 installed. E.g. system checks will be loaded from here (under checks 
-subdirectory). On debian systems you may want to specify modules dir 
-independent on your installer location. If you specify this option your 
-installer puppet modules will be loaded from here.
+subdirectory). You can optionally change foreman-installer modules dir
+using modules_dir option.
+
+On debian systems you may want to specify kafo modules dir
+independent on your installer location. If you specify this option kafo
+internal installer puppet modules will be loaded from here.
 
 ## Order of puppet modules execution
 

data/config/kafo.yaml.example

@@ -9,6 +9,8 @@
 # :installer_dir: /usr/share/kafo/
 # Uncomment if you want to load puppet modules from a specific path, $pwd/modules is used by default
 # :modules_dir: /usr/share/kafo/modules
+# Similar as modules_dir but for kafo internal modules, leave nil if you don't need to change it
+# :kafo_modules_dir:
 
 ## Kafo tuning, customization of core functionality
 # :no_prefix: false

data/lib/kafo/kafo_configure.rb

@@ -15,7 +15,8 @@ class KafoConfigure < Clamp::Command
   attr_reader :logger
 
   class << self
-    attr_accessor :config, :root_dir, :config_file, :gem_root, :temp_config_file, :modules_dir
+    attr_accessor :config, :root_dir, :config_file, :gem_root, :temp_config_file,
+                  :modules_dir, :kafo_modules_dir
   end
 
   def initialize(*args)
@@ -25,6 +26,7 @@ class KafoConfigure < Clamp::Command
     modules_dir            = self.class.config.app[:module_dir] || (self.class.config.app[:installer_dir] + '/modules')
     self.class.modules_dir = File.expand_path(modules_dir)
     self.class.gem_root    = File.join(File.dirname(__FILE__), '../../')
+    self.class.kafo_modules_dir = self.class.config.app[:kafo_modules_dir] || (self.class.gem_root + '/modules')
     Logger.setup
     @logger = Logging.logger.root
     check_env

data/lib/kafo/puppet_command.rb

@@ -31,8 +31,8 @@ class PuppetCommand
 
   def modules_path
     [
-        KafoConfigure.config.app[:modules_dir],
-        File.join(KafoConfigure.gem_root, 'modules')
+        KafoConfigure.modules_dir,
+        KafoConfigure.kafo_modules_dir,
     ].join(':')
   end
 end

data/lib/kafo/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module Kafo
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kafo
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors: