Skip to content

Commit

Permalink
Merge pull request voxpupuli#126 from petems/fix_beaker
Browse files Browse the repository at this point in the history
Fix beaker
  • Loading branch information
petems authored Oct 14, 2016
2 parents e469231 + 52852b0 commit 2c16382
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 7 deletions.
15 changes: 15 additions & 0 deletions spec/acceptance/nodesets/centos-6-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
HOSTS:
centos-6-x64:
roles:
- master
platform: el-6-x86_64
image: centos:6.7
hypervisor: docker
docker_cmd: ["/sbin/init"]
docker_preserve_image: true
docker_image_commands:
- yum install -y wget tar which
- rm /etc/init/tty.conf
CONFIG:
type: foss
log_level: debug
14 changes: 7 additions & 7 deletions spec/acceptance/redis_spec.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
require 'spec_helper_acceptance'

describe 'redis' do
it 'should run successfully' do
case fact('osfamily')
when 'Debian'
redis_name = 'redis-server'
else
redis_name = 'redis'
end
case fact('osfamily')
when 'Debian'
redis_name = 'redis-server'
else
redis_name = 'redis'
end

it 'should run successfully' do
pp = <<-EOS
Exec {
path => [ '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', ]
Expand Down

0 comments on commit 2c16382

Please sign in to comment.