rebase against master, fix spec failure

Author: bastelfreak

manifests/master.pp

@@ -88,6 +88,7 @@
   $puppet_docroot               = $::puppet::params::puppet_docroot,
   $puppet_vardir                = $::puppet::params::puppet_vardir,
   $puppet_proxy_port            = $::puppet::params::puppet_proxy_port,
+  $puppet_conf                  = $::puppet::params::puppet_conf,
   $puppet_passenger_tempdir     = false,
   $puppet_passenger_cfg_addon   = '',
   $puppet_master_package        = $::puppet::params::puppet_master_package,
@@ -193,7 +194,6 @@
         passenger_high_performance    => $passenger_high_performance,
         passenger_max_requests        => $passenger_max_requests,
         passenger_stat_throttle_rate  => $passenger_stat_throttle_rate,
-
       } ->
       Anchor['puppet::master::end']
     }

spec/classes/puppet_passenger_spec.rb

@@ -3,7 +3,7 @@
 describe 'puppet::passenger', :type => :class do
       let (:params) do
             {
-                :puppet_proxy_port        => '8140',
+                :puppet_proxy_port            => '8140',
                 :puppet_docroot               => '/etc/puppet/rack/public/',
                 :apache_serveradmin           => 'root',
                 :puppet_conf                  => '/etc/puppet/puppet.conf',

spec/classes/puppet_repo_puppetlabs_spec.rb

@@ -15,6 +15,11 @@
         :mirror => 'http://apt.puppetlabs.com',
       }
     end
+    let :params do
+      {
+        :mirror => 'http://apt.puppetlabs.com',
+      }
+    end
     it 'should contain puppetlabs apt repos' do
       should contain_apt__source('puppetlabs').with(
         :repos      => 'main',