opendev/system-config
Code Issues Proposed changes

Merge "Configure puppetmaster server from manifest"

Browse Source
This commit is contained in:
Jenkins 2015-03-23 11:41:14 +00:00 committed by Gerrit Code Review
commit 9903c8c7f3
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/openstack_project/manifests/base.pp
View File

@ -5,6 +5,7 @@ class openstack_project::base(
$install_users = true, $install_users = true,
$pin_puppet = '3.', $pin_puppet = '3.',
$ca_server = undef, $ca_server = undef,
$puppetmaster_server = 'puppetmaster.openstack.org',
) { ) {
if ($::osfamily == 'Debian') { if ($::osfamily == 'Debian') {
include apt include apt

2
modules/openstack_project/manifests/server.pp
View File

@ -11,6 +11,7 @@ class openstack_project::server (
$pin_puppet = '3.', $pin_puppet = '3.',
$ca_server = undef, $ca_server = undef,
$afs = false, $afs = false,
$puppetmaster_server = 'puppetmaster.openstack.org',
) { ) {
class { 'openstack_project::template': class { 'openstack_project::template':
iptables_public_tcp_ports => $iptables_public_tcp_ports, iptables_public_tcp_ports => $iptables_public_tcp_ports,
@ -20,6 +21,7 @@ class openstack_project::server (
certname => $certname, certname => $certname,
pin_puppet => $pin_puppet, pin_puppet => $pin_puppet,
ca_server => $ca_server, ca_server => $ca_server,
puppetmaster_server => $puppetmaster_server,
afs => $afs, afs => $afs,
} }
class { 'exim': class { 'exim':

10
modules/openstack_project/manifests/template.pp
View File

@ -15,6 +15,7 @@ class openstack_project::template (
$ca_server = undef, $ca_server = undef,
$enable_unbound = true, $enable_unbound = true,
$afs = false, $afs = false,
$puppetmaster_server = 'puppetmaster.openstack.org',
) { ) {
include ntp include ntp
include ssh include ssh
@ -50,10 +51,11 @@ class openstack_project::template (
} }
class { 'openstack_project::base': class { 'openstack_project::base':
install_users => $install_users, install_users => $install_users,
certname => $certname, certname => $certname,
pin_puppet => $pin_puppet, pin_puppet => $pin_puppet,
ca_server => $ca_server, ca_server => $ca_server,
puppetmaster_server => $puppetmaster_server,
} }
package { 'lvm2': package { 'lvm2':

2
modules/openstack_project/templates/puppet.conf.erb
View File

@ -3,7 +3,7 @@ logdir=/var/log/puppet
vardir=/var/lib/puppet vardir=/var/lib/puppet
ssldir=/var/lib/puppet/ssl ssldir=/var/lib/puppet/ssl
rundir=/var/run/puppet rundir=/var/run/puppet
server=puppetmaster.openstack.org server=<%= @puppetmaster_server %>
certname=<%= @certname %> certname=<%= @certname %>
pluginsync=true pluginsync=true