diff --git a/Rakefile b/Rakefile
index 15f44f8d00..acced86925 100644
--- a/Rakefile
+++ b/Rakefile
@@ -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')
diff --git a/install_modules.sh b/install_modules.sh
index da2468c886..4d57e71286 100755
--- a/install_modules.sh
+++ b/install_modules.sh
@@ -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
diff --git a/modules/openstack_project/manifests/puppetboard.pp b/modules/openstack_project/manifests/puppetboard.pp
index d43157e2cf..18f518a5ff 100644
--- a/modules/openstack_project/manifests/puppetboard.pp
+++ b/modules/openstack_project/manifests/puppetboard.pp
@@ -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',
   }
diff --git a/modules/openstack_project/manifests/puppetdb.pp b/modules/openstack_project/manifests/puppetdb.pp
index 39237551d2..6ce9bbbb9d 100644
--- a/modules/openstack_project/manifests/puppetdb.pp
+++ b/modules/openstack_project/manifests/puppetdb.pp
@@ -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,
   }