Skip to content

Commit

Permalink
Merge pull request #548 from zilchms/spec2
Browse files Browse the repository at this point in the history
Remove legacy facts from spec files and README
  • Loading branch information
zilchms authored Apr 8, 2024
2 parents 560483d + a1fe1cc commit 50645d0
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@ providers).
```puppet
class { 'corosync':
authkey => '/var/lib/puppet/ssl/certs/ca.pem',
bind_address => $::ipaddress,
bind_address => $facts['networking']['ip'],
cluster_name => 'mycluster',
enable_secauth => true,
}
4 changes: 2 additions & 2 deletions spec/acceptance/cs_order_spec.rb
Original file line number Diff line number Diff line change
@@ -105,7 +105,7 @@ class { 'corosync':
end
end

if fact('osfamily') == 'RedHat'
if fact('os.family') == 'RedHat'
it 'creates a simple order constraint with Mandatory as kind' do
shell('cibadmin --query | grep first_then_two') do |r|
expect(r.stdout).to match(%r{kind="Mandatory"})
@@ -165,7 +165,7 @@ class { 'corosync':
end
end

if fact('osfamily') == 'RedHat'
if fact('os.family') == 'RedHat'
it 'creates a more complex order constraint with Optional as kind' do
shell('cibadmin --query | grep one_then_two_complex') do |r|
expect(r.stdout).to match(%r{kind="Optional"})
2 changes: 1 addition & 1 deletion spec/acceptance/cs_primitive_spec.rb
Original file line number Diff line number Diff line change
@@ -328,7 +328,7 @@ class { 'corosync':
},
}
EOS
if fact('osfamily') == 'RedHat'
if fact('os.family') == 'RedHat'
apply_manifest(pp, catch_failures: true, debug: false, trace: true)
apply_manifest(pp, catch_changes: true, debug: false, trace: true)
shell('pcs stonith show') do |r|
2 changes: 1 addition & 1 deletion spec/acceptance/cs_rsc_defaults_spec.rb
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
require 'spec_helper_acceptance'

describe 'corosync' do
if fact('osfamily') == 'Debian'
if fact('os.family') == 'Debian'
cert = '-----BEGIN CERTIFICATE-----
MIIDVzCCAj+gAwIBAgIJAJNCo5ZPmKegMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNV
BAYTAlhYMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQg

0 comments on commit 50645d0

Please sign in to comment.