From f341539d1b52bd68c05232788a4dc931c4c20236 Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Sat, 28 Mar 2015 10:16:09 +0000 Subject: [PATCH] Expose puppetmaster_server param on openstack_project::puppetmaster 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 --- modules/openstack_project/manifests/puppetmaster.pp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/openstack_project/manifests/puppetmaster.pp b/modules/openstack_project/manifests/puppetmaster.pp index 40fd80e55f..070c8c47c3 100644 --- a/modules/openstack_project/manifests/puppetmaster.pp +++ b/modules/openstack_project/manifests/puppetmaster.pp @@ -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':