diff options
Diffstat (limited to 'meta-openstack/recipes-support/puppet')
| -rw-r--r-- | meta-openstack/recipes-support/puppet/puppet/puppet.conf | 9 | ||||
| -rw-r--r-- | meta-openstack/recipes-support/puppet/puppet_3.7.3.bb | 2 |
2 files changed, 11 insertions, 0 deletions
diff --git a/meta-openstack/recipes-support/puppet/puppet/puppet.conf b/meta-openstack/recipes-support/puppet/puppet/puppet.conf new file mode 100644 index 00000000..efe143ce --- /dev/null +++ b/meta-openstack/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 diff --git a/meta-openstack/recipes-support/puppet/puppet_3.7.3.bb b/meta-openstack/recipes-support/puppet/puppet_3.7.3.bb index 22376cf9..f201a7b2 100644 --- a/meta-openstack/recipes-support/puppet/puppet_3.7.3.bb +++ b/meta-openstack/recipes-support/puppet/puppet_3.7.3.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f257790c70561550fd666c6e0044fd89" SRC_URI = " \ https://downloads.puppetlabs.com/puppet/puppet-${PV}.tar.gz \ file://add_puppet_gemspec.patch \ + file://puppet.conf \ " SRC_URI[md5sum] = "cc294da1d51df07bcc7f6cf78bd90ce0" SRC_URI[sha256sum] = "4a3bd7ddb51072c3dd898a8de158cde204a2d8fd0b84e8ac806b84c074348637" @@ -34,4 +35,5 @@ do_install_append() { install -m 655 ${S}/conf/auth.conf ${D}${sysconfdir}/puppet/ install -m 655 ${S}/conf/fileserver.conf ${D}${sysconfdir}/puppet/ install -m 655 ${S}/conf/tagmail.conf ${D}${sysconfdir}/puppet/ + install -m 655 ${WORKDIR}/puppet.conf ${D}${sysconfdir}/puppet/ } |