aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-support/puppet/puppet
diff options
context:
space:
mode:
authorMark Asselstine <mark.asselstine@windriver.com>2015-08-19 22:56:11 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2015-08-20 13:38:48 -0400
commit1aa30310259027ebb87ee95ef914ca3de55d6a09 (patch)
tree72a940aacd777a4512771abddcd30637c29b57b7 /recipes-support/puppet/puppet
parentbd7a3f804950ae454d025aa8773789441a63820c (diff)
downloadmeta-cloud-services-1aa30310259027ebb87ee95ef914ca3de55d6a09.tar.gz
meta-cloud-services-1aa30310259027ebb87ee95ef914ca3de55d6a09.tar.bz2
meta-cloud-services-1aa30310259027ebb87ee95ef914ca3de55d6a09.zip
puppet: move to base layer
Puppet can be used by many 'cloud services', it is not openstack specific, so moving puppet and puppet related recipes to the meta-cloud-services base layer. This allows either internal sub-layers found in meta-cloud-services or external layers to include meta-cloud-services without being burdened by bbappends and configs found in meta-openstack. Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-support/puppet/puppet')
-rw-r--r--recipes-support/puppet/puppet/add_puppet_gemspec.patch23
-rw-r--r--recipes-support/puppet/puppet/puppet.conf9
2 files changed, 32 insertions, 0 deletions
diff --git a/recipes-support/puppet/puppet/add_puppet_gemspec.patch b/recipes-support/puppet/puppet/add_puppet_gemspec.patch
new file mode 100644
index 0000000..a5c8e3b
--- /dev/null
+++ b/recipes-support/puppet/puppet/add_puppet_gemspec.patch
@@ -0,0 +1,23 @@
+diff -urN puppet-3.7.3_ori/puppet.gemspec puppet-3.7.3/puppet.gemspec
+--- puppet-3.7.3_ori/puppet.gemspec 1970-01-01 08:00:00.000000000 +0800
++++ puppet-3.7.3/puppet.gemspec 2014-11-12 14:30:07.000000000 +0800
+@@ -0,0 +1,19 @@
++$:.unshift(File.dirname(__FILE__) + '/lib')
++require 'puppet/version'
++
++Gem::Specification.new do |s|
++ s.name = 'puppet'
++ s.version = Puppet::PUPPETVERSION
++ s.platform = Gem::Platform::RUBY
++ s.summary = 'Open source Puppet is a configuration management system'
++ s.description = s.summary
++ s.author = 'Yang Haibo'
++ s.email = 'b40869@freescale.com'
++ s.homepage = 'https://puppetlabs.com/puppet/puppet-open-source'
++ s.license = 'Apache 2.0'
++
++ s.bindir = 'bin'
++ s.executables = ['puppet', 'extlookup2hiera']
++ s.require_path = 'lib'
++ s.files = %w(LICENSE README.md Rakefile) + Dir.glob('{lib,spec}/**/*')
++end
diff --git a/recipes-support/puppet/puppet/puppet.conf b/recipes-support/puppet/puppet/puppet.conf
new file mode 100644
index 0000000..efe143c
--- /dev/null
+++ b/recipes-support/puppet/puppet/puppet.conf
@@ -0,0 +1,9 @@
+[main]
+logdir=/var/log/puppet
+vardir=/var/lib/puppet
+ssldir=/var/lib/puppet/ssl
+rundir=/var/run/puppet
+factpath=$vardir/lib/facter
+
+[agent]
+server=puppet-server