Merge pull request puppetlabs#648 from bmjen/sync-with-master

Sync with master

Author: jonnytdevops

.fixtures.yml

@@ -1,6 +1,8 @@
 fixtures:
   repositories:
-    apt: "https://github.com/puppetlabs/puppetlabs-apt.git"
+    apt: 
+      repo: "https://github.com/puppetlabs/puppetlabs-apt.git"
+      branch: "1.8.x"
     stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
     firewall: "https://github.com/puppetlabs/puppetlabs-firewall.git"
     concat: "https://github.com/puppetlabs/puppetlabs-concat.git"

CHANGELOG.md

@@ -16,10 +16,12 @@ This release has several new features, bugfixes, and test improvements.
 - Fix execution command with puppet <3.4 (MODULES-1923)
 - Fix Puppet.newtype deprecation warning (MODULES-2007)
 - Fix systemd override for manage_repo package versions
+- Fix Copy snakeoil certificate and key instead of symlinking
 
 #### Test Improvements
 - Allows setting BEAKER and BEAKER_RSPEC versions via environment variables.
 - Enables Unit testing on Travis CI with Puppet 4.
+- Cleans up spec_helper_acceptance.rb to use new puppet_install_helper gem.
 
 ## 2015-03-24 - Supported Release 4.3.0
 ### Summary

Gemfile

@@ -28,6 +28,7 @@ group :system_tests do
     gem 'beaker-rspec',  :require => false
   end
   gem 'serverspec',    :require => false
+  gem 'beaker-puppet_install_helper', :require => false
 end
 
 

manifests/server/initdb.pp

@@ -83,19 +83,25 @@
       require   => File[$require_before_initdb],
     }
     # The package will take care of this for us the first time, but if we
-    # ever need to init a new db we need to make these links explicitly
+    # ever need to init a new db we need to copy these files explicitly
     if $::operatingsystem == 'Debian' or $::operatingsystem == 'Ubuntu' {
       if $::operatingsystemrelease =~ /^6/ or $::operatingsystemrelease =~ /^7/ or $::operatingsystemrelease =~ /^10\.04/ or $::operatingsystemrelease =~ /^12\.04/ {
         file { 'server.crt':
-          ensure  => link,
+          ensure  => file,
           path    => "${datadir}/server.crt",
-          target  => '/etc/ssl/certs/ssl-cert-snakeoil.pem',
+          source  => 'file:///etc/ssl/certs/ssl-cert-snakeoil.pem',
+          owner   => $::postgresql::server::user,
+          group   => $::postgresql::server::group,
+          mode    => '0644',
           require => Exec['postgresql_initdb'],
         }
         file { 'server.key':
-          ensure  => link,
+          ensure  => file,
           path    => "${datadir}/server.key",
-          target  => '/etc/ssl/private/ssl-cert-snakeoil.key',
+          source  => 'file:///etc/ssl/private/ssl-cert-snakeoil.key',
+          owner   => $::postgresql::server::user,
+          group   => $::postgresql::server::group,
+          mode    => '0600',
           require => Exec['postgresql_initdb'],
         }
       }

spec/spec_helper_acceptance.rb

@@ -1,5 +1,10 @@
 require 'beaker-rspec/spec_helper'
 require 'beaker-rspec/helpers/serverspec'
+require 'beaker/puppet_install_helper'
+
+run_puppet_install_helper
+
+UNSUPPORTED_PLATFORMS = ['AIX','windows','Solaris','Suse']
 
 class String
   # Provide ability to remove indentation from strings, for the purpose of
@@ -34,27 +39,6 @@ def psql(psql_cmd, user = 'postgres', exit_codes = [0,1], &block)
   shell("su #{shellescape(user)} -c #{shellescape(psql)}", :acceptable_exit_codes => exit_codes, &block)
 end
 
-unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
-  # This will install the latest available package on el and deb based
-  # systems fail on windows and osx, and install via gem on other *nixes
-  foss_opts = { :default_action => 'gem_install' }
-
-  if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end
-
-  hosts.each do |host|
-    shell("mkdir -p #{host['distmoduledir']}")
-    if ! host.is_pe?
-      # Augeas is only used in one place, for Redhat.
-      if fact('osfamily') == 'RedHat'
-        install_package host, 'ruby-devel'
-        #install_package host, 'augeas-devel'
-        #install_package host, 'ruby-augeas'
-      end
-    end
-  end
-end
-
-UNSUPPORTED_PLATFORMS = ['AIX','windows','Solaris','Suse']
 
 RSpec.configure do |c|
   # Project root
@@ -92,7 +76,7 @@ def psql(psql_cmd, user = 'postgres', exit_codes = [0,1], &block)
     hosts.each do |host|
       on host, "/bin/touch #{default['puppetpath']}/hiera.yaml"
       on host, 'chmod 755 /root'
-      if fact('osfamily') == 'Debian'
+      if fact_on(host, 'osfamily') == 'Debian'
         on host, "echo \"en_US ISO-8859-1\nen_NG.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\n\" > /etc/locale.gen"
         on host, '/usr/sbin/locale-gen'
         on host, '/usr/sbin/update-locale'