Browse Source

Further changes to bring puppetboard online

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
changes/11/82311/6
Spencer Krum 5 years ago
parent
commit
101e58991c
4 changed files with 12 additions and 5 deletions
  1. +2
    -1
      Rakefile
  2. +1
    -1
      install_modules.sh
  3. +2
    -2
      modules/openstack_project/manifests/puppetboard.pp
  4. +7
    -1
      modules/openstack_project/manifests/puppetdb.pp

+ 2
- 1
Rakefile View File

@@ -3,6 +3,7 @@ require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-lint/tasks/puppet-lint'
PuppetLint.configuration.fail_on_warnings = true
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')

+ 1
- 1
install_modules.sh View File

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

+ 2
- 2
modules/openstack_project/manifests/puppetboard.pp View File

@@ -5,7 +5,7 @@ class openstack_project::puppetboard(
$user = $::puppetboard::params::user,
$group = $::puppetboard::params::group,
$port = '80',
) {
) inherits ::puppetboard::params {

include apache

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

+ 7
- 1
modules/openstack_project/manifests/puppetdb.pp View File

@@ -20,8 +20,14 @@ class openstack_project::puppetdb (
system => true,
}

if $puppetboard {
$open_ports = [8081, 80]
} else {
$open_ports = [8081]
}

class { 'openstack_project::server':
iptables_public_tcp_ports => [8081],
iptables_public_tcp_ports => $open_ports,
sysadmins => $sysadmins,
}


Loading…
Cancel
Save