opendev/system-config
Code Issues Proposed changes

Merge "Decouple openstack_project::server from puppetdb class"

Browse Source
This commit is contained in:
Jenkins 2016-03-10 15:29:03 +00:00 committed by Gerrit Code Review
commit af4435ef99
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/site.pp
View File

@ -233,9 +233,12 @@ node 'puppetmaster.openstack.org' {
# Node-OS: precise # Node-OS: precise
node 'puppetdb.openstack.org' { node 'puppetdb.openstack.org' {
class { 'openstack_project::puppetdb': $open_ports = [8081, 80]
sysadmins => hiera('sysadmins', []), class { 'openstack_project::server':
iptables_public_tcp_ports => $open_ports,
sysadmins => hiera('sysadmins', []),
} }
include openstack_project::puppetdb
} }
# Node-OS: precise # Node-OS: precise

14
modules/openstack_project/manifests/puppetdb.pp
View File

@ -1,7 +1,6 @@
# == Class: openstack_project::puppetdb # == Class: openstack_project::puppetdb
# #
class openstack_project::puppetdb ( class openstack_project::puppetdb (
$sysadmins = [],
$puppetboard = true, $puppetboard = true,
) { ) {
@ -20,18 +19,7 @@ class openstack_project::puppetdb (
system => true, system => true,
} }
if $puppetboard { class { 'puppetdb::database::postgresql':
$open_ports = [8081, 80]
} else {
$open_ports = [8081]
}
class { 'openstack_project::server':
iptables_public_tcp_ports => $open_ports,
sysadmins => $sysadmins,
}
class { '::puppetdb::database::postgresql':
require => [User['postgres'], require => [User['postgres'],
Class['openstack_project::template'],], Class['openstack_project::template'],],
} }