Merge pull request #101 from danieldreier/thin_beaker_tests

Fix thin support

Author: Zach Leslie

.fixtures.yml

@@ -15,6 +15,7 @@ fixtures:
     inifile: "git://github.com/puppetlabs/puppetlabs-inifile.git"
     apache: "git://github.com/puppetlabs/puppetlabs-apache.git"
     portage: "git://github.com/gentoo/puppet-portage.git"
+    thin: "git://github.com/danieldreier/puppet-thin.git"
   symlinks:
     puppet: "#{source_dir}"
 

Modulefile

@@ -16,3 +16,4 @@ dependency 'puppetlabs/inifile',          '>= 1.0.0'
 dependency 'puppetlabs/apache',           '>= 0.9.0'
 dependency 'gentoo/portage',              '>= 2.1.0'
 dependency 'ploperations/nginx'
+dependency 'danieldreier/thin'

manifests/server/thin.pp

@@ -4,6 +4,23 @@
   include puppet::server::rack
 
   class { 'puppet::server::standalone': enabled => false }
+  class { '::thin': }
+  class { 'nginx::server': }
+
+  Ini_setting {
+    ensure  => 'present',
+    section => 'master',
+    path    => $puppet::params::puppet_conf,
+  }
+
+  ini_setting {
+    'ssl_client_header':
+      ensure  => 'absent',
+      setting => 'ssl_client_header';
+    'ssl_client_verify_header':
+      ensure  => 'absent',
+      setting => 'ssl_client_verify_header';
+  }
 
   $servers = $::processorcount
   nginx::vhost { 'puppetmaster':
@@ -18,10 +35,13 @@
   }
 
   thin::app { 'puppetmaster':
-    user      => 'puppet',
-    group     => 'puppet',
-    rackup    => "${::puppet::params::puppet_confdir}/config.ru",
-    chdir     => $puppet::params::puppet_confdir,
-    subscribe => Concat["${::puppet::params::puppet_confdir}/config.ru"],
+    user       => 'puppet',
+    group      => 'puppet',
+    rackup     => "${::puppet::params::puppet_confdir}/config.ru",
+    chdir      => $puppet::params::puppet_confdir,
+    subscribe  => Concat["${::puppet::params::puppet_confdir}/config.ru"],
+    require    => Class['::thin'],
+    socket     => '/var/run/thin/puppetmaster.sock',
+    force_home => '/etc/puppet',
   }
 }

spec/acceptance/server_spec.rb

@@ -117,4 +117,43 @@ class { "puppet::server":
     end
   end
 
+  context 'running on thin' do
+    after(:all) do
+      cleanup_server()
+    end
+
+    it 'should run with no errors' do
+      pp = <<-EOS
+        class { "puppet::server":
+          servertype   => 'thin',
+          ca           => true,
+        }
+      EOS
+
+      # Run it twice and test for idempotency
+      apply_manifest(pp, :catch_failures => true)
+      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+    end
+
+    describe package('thin') do
+      it {
+        should be_installed.by('gem')
+      }
+    end
+
+    describe service('thin-puppetmaster') do
+      it {
+        should be_enabled
+      }
+      it {
+        should be_running
+      }
+    end
+
+    describe port(8140) do
+      it {
+        should be_listening
+      }
+    end
+  end
 end

spec/classes/server_spec.rb

@@ -160,4 +160,45 @@
       end
     end
   end
+  describe "thin puppet::server" do
+    let(:params) {{
+      :servertype   => 'thin',
+      :storeconfigs => 'puppetdb',
+      :manifest     => '/etc/puppet/manifests/site.pp',
+      :modulepath   => ['/etc/puppet/environments/production/modules'],
+      :ca           => true,
+    }}
+    context 'Debian' do
+      let(:facts) {{
+        :operatingsystem        => 'debian',
+        :operatingsystemrelease => '7',
+        :osfamily               => 'debian',
+        :puppetversion          => '3.4.2',
+        :concat_basedir         => '/foo',
+        :kernel                 => 'linux',
+        :lsbdistid              => 'debian',
+        :lsbdistcodename        => 'wheezy',
+      }}
+      it_behaves_like "all puppet master types"
+      it_behaves_like "basic puppetmaster config"
+
+      it { should contain_package('puppetmaster') }
+
+      # Tests specific to passenger server
+      it { should contain_class('puppet::server::thin') }
+
+      it do
+        should contain_service('puppetmaster').with({
+          :ensure => "stopped"
+        })
+        should contain_service('nginx').with({
+          :ensure => "running"
+        })
+        should contain_service('thin-puppetmaster').with({
+          :ensure => "running"
+        })
+        should contain_file('/etc/thin.d/puppetmaster.yml')
+      end
+    end
+  end
 end

spec/spec_helper_acceptance.rb

@@ -51,6 +51,9 @@
 mod 'inifile',        :git => 'git://github.com/puppetlabs/puppetlabs-inifile.git'
 mod 'apache',         :git => 'git://github.com/puppetlabs/puppetlabs-apache.git'
 mod 'portage',        :git => 'git://github.com/gentoo/puppet-portage.git'
+mod 'thin',           :git => 'git://github.com/danieldreier/puppet-thin.git'
+
+
   EOS
   on host, "echo \"#{puppetfile}\" > /etc/puppet/Puppetfile"
   on host, "cd /etc/puppet; r10k puppetfile install"

templates/vhost/nginx/thin.conf.erb

@@ -1,7 +1,7 @@
 # nginx configuration for a puppetmaster running on thin
 
 upstream puppetmaster_upstream {
-<% (0...servers.to_i).each do |count| %>
+<% (0...@servers.to_i).each do |count| %>
   server unix:/var/run/thin/puppetmaster.<%= count %>.sock max_fails=0 fail_timeout=0s;
 <% end -%>
 }

tests/thin.pp

@@ -0,0 +1,4 @@
+class { 'puppet::server':
+  servertype   => 'thin',
+  ca           => true,
+}