opendev/system-config
Code Issues Proposed changes

Move server outside of puppetmaster class

Browse Source 
Change-Id: I9795cbf5554047b7b2fb5e13283884af9760a60d
Story: 2000172
Spec: http://specs.openstack.org/openstack-infra/infra-specs/specs/server_base_template_refactor.html
This commit is contained in:
Yolanda Robla 2015-04-10 17:36:44 +02:00
parent 05d1fee6ec
commit 0f01a53090
2 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/site.pp
View File

@ -175,10 +175,13 @@ node 'cacti.openstack.org' {
# Node-OS: precise # Node-OS: precise
node 'puppetmaster.openstack.org' { node 'puppetmaster.openstack.org' {
class { 'openstack_project::server':
iptables_public_tcp_ports => [4505, 4506, 8140],
sysadmins => hiera('sysadmins', []),
pin_puppet => '3.6.',
}
class { 'openstack_project::puppetmaster': class { 'openstack_project::puppetmaster':
root_rsa_key => hiera('puppetmaster_root_rsa_key', 'XXX'), root_rsa_key => hiera('puppetmaster_root_rsa_key', 'XXX'),
sysadmins => hiera('sysadmins', []),
version => '3.6.',
} }
} }

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

@ -2,24 +2,12 @@
# #
class openstack_project::puppetmaster ( class openstack_project::puppetmaster (
$root_rsa_key = 'xxx', $root_rsa_key = 'xxx',
$sysadmins = [],
$version = '3.',
$ca_server = undef,
$puppetdb = true, $puppetdb = true,
$puppetdb_server = 'puppetdb.openstack.org', $puppetdb_server = 'puppetdb.openstack.org',
$puppetmaster_server = 'puppetmaster.openstack.org',
) { ) {
include logrotate include logrotate
include openstack_project::params include openstack_project::params
class { 'openstack_project::server':
iptables_public_tcp_ports => [4505, 4506, 8140],
sysadmins => $sysadmins,
pin_puppet => $version,
ca_server => $ca_server,
puppetmaster_server => $puppetmaster_server,
}
file {'/etc/puppet/environments': file {'/etc/puppet/environments':
ensure => directory, ensure => directory,
owner => 'root', owner => 'root',