Merge branch 'master' of github.com:stephenrjohnson/puppetmodule

Author: Stephen

manifests/master.pp

@@ -190,7 +190,7 @@
       dbserver                   => $storeconfigs_dbserver,
       dbport                     => $storeconfigs_dbport,
       puppet_service             => Service['httpd'],
-      puppet_confdir             => $::puppet::params::puppet_confdir,
+      puppet_confdir             => $::puppet::params::confdir,
       puppet_conf                => $::puppet::params::puppet_conf,
       puppet_master_package      => $puppet_master_package,
       puppetdb_startup_timeout   => $puppetdb_startup_timeout,