Fixed default options and templates for puppetserver

example42 · May 4, 2016 · 9cbb00c · 9cbb00c
1 parent 66225b8
commit 9cbb00c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 19 deletions.
diff --git a/data/puppet-agent/default.yaml b/data/puppet-agent/default.yaml
@@ -16,3 +16,4 @@
     process_name: 'puppet'
     process_user: 'root'
     process_group: 'root'
+    config_file_template: 'puppet/profile/agent/init.erb'        
diff --git a/data/puppetserver/default.yaml b/data/puppetserver/default.yaml
@@ -18,8 +18,9 @@
     config_dir_group: 'puppet'
     config_dir_mode: '0750'
     nodaemon_args: 'foreground'
+    init_file_template: 'puppet/profile/server/init.erb'
 
-    puppetserver::options::init:
+  puppetserver::options::init:
       java_args: '-Xms2g -Xmx2g -XX:MaxPermSize=256m'
       service_stop_retries: '60'
       start_timeout: '120'
diff --git a/manifests/profile/server.pp b/manifests/profile/server.pp
@@ -11,23 +11,9 @@
 
   include ::puppet
 
-  $tp_settings = tp_lookup('puppetserver','settings',$::puppet::data_module,'merge')
-  $module_settings = $tp_settings + $settings
-
-  $tp_config_options=tp_lookup('puppetserver','options::puppetserver::config',$::puppet::data_module,merge)
-  $tp_init_options=tp_lookup('puppetserver','options::puppetserver::init',$::puppet::data_module,merge)
-  $real_config_options=$tp_config_options + $options
-  $real_init_options=$tp_init_options + $options
-
-  if $module_settings['service_name'] and $service_autorestart {
-    $service_notify = "Service[${module_settings['service_name']}]"
-  } else {
-    $service_notify = undef
-  } 
-
   ::tp::install { 'puppetserver':
     ensure        => $ensure,
-    settings_hash => $module_settings,
+    settings_hash => $settings,
     data_module   => $::puppet::data_module,
     auto_conf     => false,
   }
@@ -36,7 +22,8 @@
     ::tp::conf { 'puppetserver':
       ensure             => $ensure,
       template           => $config_template,
-      settings_hash      => $module_settings,
+      settings_hash      => $settings,
+      options_hash       => $options,
       config_file_notify => $service_autorestart,
       data_module        => $::puppet::data_module,
     }
@@ -46,8 +33,8 @@
     ::tp::conf { 'puppetserver::init':
       ensure             => $ensure,
       template           => $init_template,
-      options_hash       => $real_init_options,
-      settings_hash      => $module_settings,
+      options_hash       => $options,
+      settings_hash      => $settings,
       base_file          => 'init',
       config_file_notify => $service_autorestart,
       data_module        => $::puppet::data_module,