Skip to content

Commit 659c0c0

Browse files
Fix acceptance test
1 parent 0b041e5 commit 659c0c0

File tree

5 files changed

+19
-5
lines changed

5 files changed

+19
-5
lines changed

README.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,10 @@ Lint and rspec-puppet:
7373

7474
If you have a working Vagrant setup you can run the rspec-system tests:
7575

76-
bundle exec rake spec:system
76+
bundle exec rake beaker
7777

7878
To use different base boxes than the default pass the name of the box to
7979
the rake command with the ```RSPEC_SET``` environment variable (check out
8080
.nodelist.yml for box names):
8181

82-
RSPEC_SET=centos-64-x64 bundle exec rake spec:system
82+
BEAKER_set=ubuntu-server-1404-x64 bundle exec rake beaker

spec/acceptance/master_spec.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
context 'without puppetdb' do
55
it 'puppet::master class should work with no errors' do
66
pp = <<-EOS
7-
class { 'puppet::master': }
7+
class { 'puppet::master':}
88
EOS
99

1010
# Run it twice and test for idempotency
@@ -19,7 +19,7 @@ class { 'puppet::master': }
1919
pp = <<-EOS
2020
class { 'puppet::master':
2121
storeconfigs => true,
22-
storeconfigs_dbserver => 'puppetdb.foo.local',
22+
storeconfigs_dbserver => 'master.test.local',
2323
puppetdb_strict_validation => false,
2424
}
2525
EOS
@@ -38,6 +38,7 @@ class { 'puppet::master':
3838
class { 'puppetdb': }
3939
class { 'puppet::master':
4040
storeconfigs => true,
41+
certname => 'master.test.local',
4142
}
4243
EOS
4344

spec/acceptance/nodesets/default.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ HOSTS:
33
roles:
44
- default
55
platform: ubuntu-12.04-amd64
6-
box : ubuntu-server-12042-x64-vbox4210-nocm
6+
box : puppetlabs/ubuntu-12.04-64-nocm
77
box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
88
hypervisor : vagrant
99
CONFIG:
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
HOSTS:
2+
master:
3+
roles:
4+
- default
5+
platform: ubuntu-14.04-amd64
6+
box : puppetlabs/ubuntu-14.04-64-nocm
7+
box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
8+
hypervisor : vagrant
9+
CONFIG:
10+
log_level : debug
11+
type: foss

spec/spec_helper_acceptance.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
puppet_module_install(:source => proj_root, :module_name => 'puppet')
1919
# Install dependencies from Modulefile
20+
shell("echo '127.0.0.1 master.test.local' >> /etc/hosts")
21+
shell('hostname master.test.local')
2022
shell('puppet module install puppetlabs-inifile')
2123
shell('puppet module install puppetlabs-apache')
2224
shell('puppet module install puppetlabs-puppetdb')

0 commit comments

Comments
 (0)