beaker 1.6.0 → 1.6.1

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- ZGEyOTZiYzFiN2YzMzJhYjYwNjg5NWE5Yjc5ZTg5NGYxMjVmODMzZA==
4
+ YTQ4ODgxMDM2MzRiMmY2NDRiODAyYTIxYTYwYjAwNjVlMTliYjc3MQ==
5
5
  data.tar.gz: !binary |-
6
- YzkyNjNlMDdlZDE0ZDlhNWQzMjFjMTBkOGNjNDEyNzA1NjMyYmFjYg==
6
+ ZDY3ZTU5YTRjYmE4MTg0YmNjNWM3MDQzYWFhNWZlMDk5YTI2Yzk3Zg==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- MDVjOGE4ZWJlYjgxYmJkYzY2ODQ5ZjExNDQyOWZjY2ZjMjEyY2YxZjZlM2I4
10
- NTc5Njg0YTk2NGNiMzFkYWNmY2YyNDNiNjFmOWU1OTlkOTU0YWJjZTBmYTIy
11
- MGM5ZDZlOTFlMWU4OWVjMGY1YjVlZjEyMzcxMjgwOTZjMzM2YWI=
9
+ MDc2Yzk0N2UwNTkxMWE0M2Y4ZjhkMjE2ZWRhNTNkMTk1MDRiMGJjYTM5YmNm
10
+ NzkxMzkxZTU4NmJmNTk1ZTdhZGQ3MWZjYWNjZTkyNGE5Mjg2NTAzMDM5MDZi
11
+ MDIyM2JiMTQ2NTc1NjBkOTYyNDE1MjhlZGY5NjljOWRkODMyYjQ=
12
12
  data.tar.gz: !binary |-
13
- MjRkZTgxNjM5MDhlODExMWI0ZTIwYzE5YzM3NmI0Yzg5ZDkwOGNlYWNlZTM4
14
- YzAzOGE4YWQyNTljNjUyZDM1NTE3MjVmZGU4OWE5MjI3ZWM3NjNkNWY1N2Nk
15
- MDc2OGNlNWE2NjRiMDBhMjU5NzMxMmMyMDlhNzQwMjFkZTMwMjI=
13
+ ZmM4OTIzODc2MTBlMDI4OTJlZjQ5N2M3YjkzYzliNjVmNmEyZjdiY2M2ZGJi
14
+ OTU2MGJmOTkwMjQxYzUwMWU0ZmQzNTJiN2VmOWU2ZjRkNzAzNDE2NTY5ZGVj
15
+ NDVjOWIxYTBhM2Q0MzY5NDBmMmI1YjIzOWQxOTM5ZTI5Nzg2ZDk=
@@ -5,6 +5,7 @@ module Beaker
5
5
  module Version32
6
6
  def self.answers(hosts, master_certname, options)
7
7
  dashboard = only_host_with_role(hosts, 'dashboard')
8
+ database = only_host_with_role(hosts, 'database')
8
9
  master = only_host_with_role(hosts, 'master')
9
10
 
10
11
  the_answers = Version30.answers(hosts, master_certname, options)
@@ -244,8 +244,8 @@ module Beaker
244
244
  def deploy_frictionless_to_master(host)
245
245
  klass = host['platform'].gsub(/-/, '_').gsub(/\./,'')
246
246
  klass = "pe_repo::platform::#{klass}"
247
- on dashboard, "cd /opt/puppet/share/puppet-dashboard && /opt/puppet/bin/bundle exec rake nodeclass:add[#{klass},skip]"
248
- on dashboard, "cd /opt/puppet/share/puppet-dashboard && /opt/puppet/bin/bundle exec rake node:addclass[#{master},#{klass}]"
247
+ on dashboard, "cd /opt/puppet/share/puppet-dashboard && /opt/puppet/bin/bundle exec /opt/puppet/bin/rake nodeclass:add[#{klass},skip]"
248
+ on dashboard, "cd /opt/puppet/share/puppet-dashboard && /opt/puppet/bin/bundle exec /opt/puppet/bin/rake node:addclass[#{master},#{klass}]"
249
249
  on master, "puppet agent -t", :acceptable_exit_codes => [0,2]
250
250
  end
251
251
 
@@ -1,5 +1,5 @@
1
1
  module Beaker
2
2
  module Version
3
- STRING = '1.6.0'
3
+ STRING = '1.6.1'
4
4
  end
5
5
  end
@@ -59,6 +59,11 @@ module Beaker
59
59
  @ver = '3.2'
60
60
  expect( subject.answers( hosts, master_certname, {} )['vm2']).to include :q_puppetmaster_certname
61
61
  end
62
+
63
+ it 'should add q_upgrade_with_unknown_disk_space to the dashboard on upgrade' do
64
+ @ver = '3.2'
65
+ expect( subject.answers( hosts, master_certname, {:type => :upgrade} )['vm2']).to include :q_upgrade_with_unknown_disk_space
66
+ end
62
67
  end
63
68
 
64
69
  describe Version30 do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: beaker
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.0
4
+ version: 1.6.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Puppetlabs
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-01-30 00:00:00.000000000 Z
11
+ date: 2014-01-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rspec