opendev/system-config
Code Issues Proposed changes

Expose puppetmaster_server param on openstack_project::puppetmaster

Browse Source 
The 'server' value on puppet.conf is currently hardcoded on server.pp,
which is contained within puppetmaster.
This change exposes that parameter in the outer class and in case
the user does not define it then 'puppetmaster.openstack.org' is used
, as is now.

Change-Id: I8e25397a89cf4adea4decab95de3b5c9ac817d16
This commit is contained in:
Ricardo Carrillo Cruz 2015-03-28 10:16:09 +00:00
parent 5dd8577042
commit f341539d1b
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ class openstack_project::puppetmaster (
$ca_server = undef,
$puppetdb = true,
$puppetdb_server = 'puppetdb.openstack.org',
$puppetmaster_server = 'puppetmaster.openstack.org',
) {
include logrotate
include openstack_project::params
@ -16,6 +17,7 @@ class openstack_project::puppetmaster (
sysadmins => $sysadmins,
pin_puppet => $version,
ca_server => $ca_server,
puppetmaster_server => $puppetmaster_server,
}
file {'/etc/puppet/environments':