Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/acceptance #111

Closed
wants to merge 2 commits into from
Closed

Fix/acceptance #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cbcf8d
Update spec_helper_acceptance.rb
mcanevet Nov 13, 2015
3df7497
Uninstall sendmail in RedHat < 7
mcanevet Nov 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions manifests/packages.pp
View file
Open in desktop
@@ -1,6 +1,13 @@
class postfix::packages {
include ::postfix::params

if $::osfamily == 'RedHat' and versioncmp($::operatingsystemmajrelease, '6') <= 0 {
package { 'sendmail':
ensure => absent,
require => Package['postfix'],
}
}

package { 'postfix':
ensure => $postfix::postfix_ensure,
}
Expand Down
14 changes: 3 additions & 11 deletions spec/spec_helper_acceptance.rb
View file
Open in desktop
@@ -1,15 +1,6 @@
require 'beaker-rspec'
require 'beaker_spec_helper'

include BeakerSpecHelper

hosts.each do |host|
install_puppet_on host
install_package host, 'git'
install_package host, 'tar'
install_package host, 'sudo'
on host, 'rm /usr/sbin/policy-rc.d || true'
end
install_puppet_agent_on hosts, {}

RSpec.configure do |c|
module_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
Expand All @@ -23,7 +14,8 @@
# Install module and dependencies
puppet_module_install(:source => module_root, :module_name => module_name)
hosts.each do |host|
BeakerSpecHelper::spec_prep(host)
on host, puppet('module','install','camptocamp-augeas'), { :acceptable_exit_codes => [0,1] }
on host, puppet('module','install','puppetlabs-stdlib'), { :acceptable_exit_codes => [0,1] }
end
end
end