From e06b59cd9caf42918d3d1255b2ab3f7e209be0f9 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sat, 5 Feb 2011 11:00:10 +0000 Subject: [PATCH] first stab at plugins-in-modules style Signed-off-by: Stephen Gran --- manifests/site.pp | 4 ++++ {facts => modules/debian-org/lib/facter}/architecture.rb | 0 {facts => modules/debian-org/lib/facter}/hosts.rb | 0 {facts => modules/debian-org/lib/facter}/ipaddresses.rb | 0 {facts => modules/debian-org/lib/facter}/mounts.rb | 0 {facts => modules/debian-org/lib/facter}/mta.rb | 0 {facts => modules/debian-org/lib/facter}/portforwarder.rb | 0 {facts => modules/debian-org/lib/facter}/raidarray.rb | 0 {facts => modules/debian-org/lib/facter}/servertype.rb | 0 {facts => modules/debian-org/lib/facter}/services.rb | 0 {facts => modules/debian-org/lib/facter}/software.rb | 0 .../puppetmaster}/lib/puppet/parser/functions/allnodeinfo.rb | 0 .../lib/puppet/parser/functions/extractnodeinfo.rb | 0 .../puppetmaster}/lib/puppet/parser/functions/ldapinfo.rb | 0 .../puppetmaster}/lib/puppet/parser/functions/nodeinfo.rb | 0 .../puppetmaster}/lib/puppet/parser/functions/whohosts.rb | 0 .../puppetmaster}/lib/puppet/parser/functions/yamlinfo.rb | 0 modules/puppetmaster/manifests/init.pp | 5 +++++ 18 files changed, 9 insertions(+) rename {facts => modules/debian-org/lib/facter}/architecture.rb (100%) rename {facts => modules/debian-org/lib/facter}/hosts.rb (100%) rename {facts => modules/debian-org/lib/facter}/ipaddresses.rb (100%) rename {facts => modules/debian-org/lib/facter}/mounts.rb (100%) rename {facts => modules/debian-org/lib/facter}/mta.rb (100%) rename {facts => modules/debian-org/lib/facter}/portforwarder.rb (100%) rename {facts => modules/debian-org/lib/facter}/raidarray.rb (100%) rename {facts => modules/debian-org/lib/facter}/servertype.rb (100%) rename {facts => modules/debian-org/lib/facter}/services.rb (100%) rename {facts => modules/debian-org/lib/facter}/software.rb (100%) rename {files/etc/puppet => modules/puppetmaster}/lib/puppet/parser/functions/allnodeinfo.rb (100%) rename {files/etc/puppet => modules/puppetmaster}/lib/puppet/parser/functions/extractnodeinfo.rb (100%) rename {files/etc/puppet => modules/puppetmaster}/lib/puppet/parser/functions/ldapinfo.rb (100%) rename {files/etc/puppet => modules/puppetmaster}/lib/puppet/parser/functions/nodeinfo.rb (100%) rename {files/etc/puppet => modules/puppetmaster}/lib/puppet/parser/functions/whohosts.rb (100%) rename {files/etc/puppet => modules/puppetmaster}/lib/puppet/parser/functions/yamlinfo.rb (100%) create mode 100644 modules/puppetmaster/manifests/init.pp diff --git a/manifests/site.pp b/manifests/site.pp index 8788574f8..363d0fc5f 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -61,6 +61,10 @@ node default { } } + case extractnodeinfo($nodeinfo, 'puppetmaster') { + true: { include puppetmaster } + } + case extractnodeinfo($nodeinfo, 'muninmaster') { true: { include munin-node::master } } diff --git a/facts/architecture.rb b/modules/debian-org/lib/facter/architecture.rb similarity index 100% rename from facts/architecture.rb rename to modules/debian-org/lib/facter/architecture.rb diff --git a/facts/hosts.rb b/modules/debian-org/lib/facter/hosts.rb similarity index 100% rename from facts/hosts.rb rename to modules/debian-org/lib/facter/hosts.rb diff --git a/facts/ipaddresses.rb b/modules/debian-org/lib/facter/ipaddresses.rb similarity index 100% rename from facts/ipaddresses.rb rename to modules/debian-org/lib/facter/ipaddresses.rb diff --git a/facts/mounts.rb b/modules/debian-org/lib/facter/mounts.rb similarity index 100% rename from facts/mounts.rb rename to modules/debian-org/lib/facter/mounts.rb diff --git a/facts/mta.rb b/modules/debian-org/lib/facter/mta.rb similarity index 100% rename from facts/mta.rb rename to modules/debian-org/lib/facter/mta.rb diff --git a/facts/portforwarder.rb b/modules/debian-org/lib/facter/portforwarder.rb similarity index 100% rename from facts/portforwarder.rb rename to modules/debian-org/lib/facter/portforwarder.rb diff --git a/facts/raidarray.rb b/modules/debian-org/lib/facter/raidarray.rb similarity index 100% rename from facts/raidarray.rb rename to modules/debian-org/lib/facter/raidarray.rb diff --git a/facts/servertype.rb b/modules/debian-org/lib/facter/servertype.rb similarity index 100% rename from facts/servertype.rb rename to modules/debian-org/lib/facter/servertype.rb diff --git a/facts/services.rb b/modules/debian-org/lib/facter/services.rb similarity index 100% rename from facts/services.rb rename to modules/debian-org/lib/facter/services.rb diff --git a/facts/software.rb b/modules/debian-org/lib/facter/software.rb similarity index 100% rename from facts/software.rb rename to modules/debian-org/lib/facter/software.rb diff --git a/files/etc/puppet/lib/puppet/parser/functions/allnodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/allnodeinfo.rb similarity index 100% rename from files/etc/puppet/lib/puppet/parser/functions/allnodeinfo.rb rename to modules/puppetmaster/lib/puppet/parser/functions/allnodeinfo.rb diff --git a/files/etc/puppet/lib/puppet/parser/functions/extractnodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/extractnodeinfo.rb similarity index 100% rename from files/etc/puppet/lib/puppet/parser/functions/extractnodeinfo.rb rename to modules/puppetmaster/lib/puppet/parser/functions/extractnodeinfo.rb diff --git a/files/etc/puppet/lib/puppet/parser/functions/ldapinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/ldapinfo.rb similarity index 100% rename from files/etc/puppet/lib/puppet/parser/functions/ldapinfo.rb rename to modules/puppetmaster/lib/puppet/parser/functions/ldapinfo.rb diff --git a/files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb similarity index 100% rename from files/etc/puppet/lib/puppet/parser/functions/nodeinfo.rb rename to modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb diff --git a/files/etc/puppet/lib/puppet/parser/functions/whohosts.rb b/modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb similarity index 100% rename from files/etc/puppet/lib/puppet/parser/functions/whohosts.rb rename to modules/puppetmaster/lib/puppet/parser/functions/whohosts.rb diff --git a/files/etc/puppet/lib/puppet/parser/functions/yamlinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb similarity index 100% rename from files/etc/puppet/lib/puppet/parser/functions/yamlinfo.rb rename to modules/puppetmaster/lib/puppet/parser/functions/yamlinfo.rb diff --git a/modules/puppetmaster/manifests/init.pp b/modules/puppetmaster/manifests/init.pp new file mode 100644 index 000000000..b702a1580 --- /dev/null +++ b/modules/puppetmaster/manifests/init.pp @@ -0,0 +1,5 @@ +class puppetmaster { +} +# vim:set et: +# vim:set sts=4 ts=4: +# vim:set shiftwidth=4: -- 2.20.1