opendev/system-config
Code Issues Proposed changes

Further changes to bring puppetboard online

Browse Source 
Use inherits keyword to bring puppetboard::params into scope
Use 2>&1 in install_modules to silence warnings
Set puppetdb class to open port 80 when puppetboard is used
Remove inherits from params check from puppet lint

Change-Id: I75fc35542e9f2641bcab613d7e1aef83d9300217
This commit is contained in:
Spencer Krum 2014-03-22 11:10:09 -07:00
parent 1e21751a45
commit 101e58991c
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Rakefile
View File

@ -3,6 +3,7 @@ require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-lint/tasks/puppet-lint' require 'puppet-lint/tasks/puppet-lint'
PuppetLint.configuration.fail_on_warnings = true PuppetLint.configuration.fail_on_warnings = true
PuppetLint.configuration.send('disable_80chars') PuppetLint.configuration.send('disable_80chars')
PuppetLint.configuration.send('disable_class_inherits_from_params_class')
# Disable check due to upstream bug: https://github.com/rodjek/puppet-lint/issues/170 # Disable check due to upstream bug: https://github.com/rodjek/puppet-lint/issues/170
PuppetLint.configuration.send('disable_class_parameter_defaults') PuppetLint.configuration.send('disable_class_parameter_defaults')

2
install_modules.sh
View File

@ -93,7 +93,7 @@ for MOD in ${!NONDEP_MODULES[*]} ; do
then then
# This will get run in cron, so silence non-error output # This will get run in cron, so silence non-error output
puppet module install $MOD --ignore-dependencies --version \ puppet module install $MOD --ignore-dependencies --version \
${NONDEP_MODULES[$MOD]} >/dev/null ${NONDEP_MODULES[$MOD]} >/dev/null 2>&1
fi fi
fi fi
done done

4
modules/openstack_project/manifests/puppetboard.pp
View File

@ -5,7 +5,7 @@ class openstack_project::puppetboard(
$user = $::puppetboard::params::user, $user = $::puppetboard::params::user,
$group = $::puppetboard::params::group, $group = $::puppetboard::params::group,
$port = '80', $port = '80',
) { ) inherits ::puppetboard::params {
include apache include apache
@ -36,7 +36,7 @@ class openstack_project::puppetboard(
# #
apache::vhost { $::fqdn: apache::vhost { $::fqdn:
port => 80, port => 80,
docroot => 'MEANINGLESS ARGUMENT', docroot => $docroot,
priority => '50', priority => '50',
template => 'openstack_project/puppetboard/puppetboard.vhost.erb', template => 'openstack_project/puppetboard/puppetboard.vhost.erb',
} }

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

@ -20,8 +20,14 @@ class openstack_project::puppetdb (
system => true, system => true,
} }
if $puppetboard {
$open_ports = [8081, 80]
} else {
$open_ports = [8081]
}
class { 'openstack_project::server': class { 'openstack_project::server':
iptables_public_tcp_ports => [8081], iptables_public_tcp_ports => $open_ports,
sysadmins => $sysadmins, sysadmins => $sysadmins,
} }