Merge c42d22d into 6f9e2ff

voxpupuli · Jan 5, 2017 · 24f868b · 24f868b
2 parents 6f9e2ff + c42d22d
commit 24f868b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/manifests/plugin/python/module.pp b/manifests/plugin/python/module.pp
@@ -3,6 +3,7 @@
   $config        = [],
   $ensure        = 'present',
   $module        = $title,
+  $module_import = undef,
   $modulepath    = undef,
   $script_source = undef,
 ) {
@@ -18,6 +19,11 @@
   }
   validate_absolute_path($module_dir)
 
+  $_module_import = $module_import ? {
+    undef   => $module,
+    default => $module_import
+  }
+
   if $script_source {
     file { "${module}.script":
       ensure  => $ensure,

diff --git a/templates/plugin/python/module.conf.erb b/templates/plugin/python/module.conf.erb
@@ -1,5 +1,5 @@
   <%- require 'shellwords' -%>
-  Import "<%= @module %>"
+  Import "<%= @_module_import %>"
 
   <%- @config.each do |configuration| -%>