Skip to content

Commit

Permalink
switch from legacy facts to structed facts
Browse files Browse the repository at this point in the history
  • Loading branch information
bastelfreak committed May 19, 2024
1 parent 0eee368 commit 60f21f1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/puppet/provider/rabbitmq_cluster/rabbitmqctl.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ def create
init_node = @resource[:init_node].to_s.gsub(%r{^.*@}, '')
local_node = @resource[:local_node].to_s.gsub(%r{^.*@}, '')

if local_node == init_node || [Facter.value(:hostname), Facter.value(:fqdn)].include?(init_node)
if local_node == init_node || [Facter.value(:networking)['hostname'], Facter.value(:networkin)['fqdn']].include?(init_node)
return rabbitmqctl('set_cluster_name', @resource[:name]) unless cluster_name == resource[:name].to_s
else
rabbitmqctl('stop_app')
Expand Down
4 changes: 2 additions & 2 deletions spec/acceptance/clustering_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
it 'runs successfully' do
pp = <<-EOS
class { 'rabbitmq':
cluster => { 'name' => 'rabbit_cluster', 'init_node' => $facts['fqdn'] },
cluster => { 'name' => 'rabbit_cluster', 'init_node' => $facts['networking']['fqdn'] },
config_cluster => true,
cluster_nodes => ['rabbit1', 'rabbit2'],
cluster_node_type => 'ram',
Expand All @@ -28,7 +28,7 @@ class { 'rabbitmq':
it 'runs successfully' do

Check failure on line 28 in spec/acceptance/clustering_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 8 - CentOS 7

rabbitmq clustering rabbitmq::wipe_db_on_cookie_change => true runs successfully Failure/Error: apply_manifest(pp, catch_failures: true) Beaker::Host::CommandFailure: Host 'centos7-64-puppet8.example.com' exited with 6 running: puppet apply --verbose --detailed-exitcodes /tmp/apply_manifest_173347750.pp.FVMaQ0 Last 10 lines of output were: �[mNotice: /Stage[main]/Rabbitmq::Service/Service[rabbitmq-server]/ensure: ensure changed 'stopped' to 'running' Info: /Stage[main]/Rabbitmq::Service/Service[rabbitmq-server]: Unscheduling refresh on Service[rabbitmq-server] Error: Could not set 'present' on ensure: undefined method `[]' for nil:NilClass (file: /etc/puppetlabs/code/environments/production/modules/rabbitmq/manifests/init.pp, line: 584) Error: Could not set 'present' on ensure: undefined method `[]' for nil:NilClass (file: /etc/puppetlabs/code/environments/production/modules/rabbitmq/manifests/init.pp, line: 584) Wrapped exception: undefined method `[]' for nil:NilClass Error: /Stage[main]/Rabbitmq/Rabbitmq_cluster[rabbit_cluster]/ensure: change from 'absent' to 'present' failed: Could not set 'present' on ensure: undefined method `[]' for nil:NilClass (file: /etc/puppetlabs/code/environments/production/modules/rabbitmq/manifests/init.pp, line: 584) Info: Class[Rabbitmq]: Unscheduling all events on Class[Rabbitmq] Info: Stage[main]: Unscheduling all events on Stage[main] �[mNotice: Applied catalog in 1.82 seconds

Check failure on line 28 in spec/acceptance/clustering_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 7 - CentOS 7

rabbitmq clustering rabbitmq::wipe_db_on_cookie_change => true runs successfully Failure/Error: apply_manifest(pp, catch_failures: true) Beaker::Host::CommandFailure: Host 'centos7-64-puppet7.example.com' exited with 6 running: puppet apply --verbose --detailed-exitcodes /tmp/apply_manifest_173255884.pp.JAHGPY Last 10 lines of output were: �[mNotice: /Stage[main]/Rabbitmq::Service/Service[rabbitmq-server]/ensure: ensure changed 'stopped' to 'running' Info: /Stage[main]/Rabbitmq::Service/Service[rabbitmq-server]: Unscheduling refresh on Service[rabbitmq-server] Error: Could not set 'present' on ensure: undefined method `[]' for nil:NilClass (file: /etc/puppetlabs/code/environments/production/modules/rabbitmq/manifests/init.pp, line: 584) Error: Could not set 'present' on ensure: undefined method `[]' for nil:NilClass (file: /etc/puppetlabs/code/environments/production/modules/rabbitmq/manifests/init.pp, line: 584) Wrapped exception: undefined method `[]' for nil:NilClass Error: /Stage[main]/Rabbitmq/Rabbitmq_cluster[rabbit_cluster]/ensure: change from 'absent' to 'present' failed: Could not set 'present' on ensure: undefined method `[]' for nil:NilClass (file: /etc/puppetlabs/code/environments/production/modules/rabbitmq/manifests/init.pp, line: 584) Info: Class[Rabbitmq]: Unscheduling all events on Class[Rabbitmq] Info: Stage[main]: Unscheduling all events on Stage[main] �[mNotice: Applied catalog in 1.87 seconds

Check failure on line 28 in spec/acceptance/clustering_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 8 - Debian 10

rabbitmq clustering rabbitmq::wipe_db_on_cookie_change => true runs successfully Failure/Error: apply_manifest(pp, catch_failures: true) Beaker::Host::CommandFailure: Host 'debian10-64-puppet8.example.com' exited with 6 running: puppet apply --verbose --detailed-exitcodes /tmp/apply_manifest_173415637.pp.JiP9Un Last 10 lines of output were: �[mNotice: /Stage[main]/Rabbitmq::Service/Service[rabbitmq-server]/ensure: ensure changed 'stopped' to 'running' Info: /Stage[main]/Rabbitmq::Service/Service[rabbitmq-server]: Unscheduling refresh on Service[rabbitmq-server] Error: Could not set 'present' on ensure: undefined method `[]' for nil:NilClass (file: /etc/puppetlabs/code/environments/production/modules/rabbitmq/manifests/init.pp, line: 584) Error: Could not set 'present' on ensure: undefined method `[]' for nil:NilClass (file: /etc/puppetlabs/code/environments/production/modules/rabbitmq/manifests/init.pp, line: 584) Wrapped exception: undefined method `[]' for nil:NilClass Error: /Stage[main]/Rabbitmq/Rabbitmq_cluster[rabbit_cluster]/ensure: change from 'absent' to 'present' failed: Could not set 'present' on ensure: undefined method `[]' for nil:NilClass (file: /etc/puppetlabs/code/environments/production/modules/rabbitmq/manifests/init.pp, line: 584) Info: Class[Rabbitmq]: Unscheduling all events on Class[Rabbitmq] Info: Stage[main]: Unscheduling all events on Stage[main] �[mNotice: Applied catalog in 7.09 seconds

Check failure on line 28 in spec/acceptance/clustering_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 7 - Debian 10

rabbitmq clustering rabbitmq::wipe_db_on_cookie_change => true runs successfully Failure/Error: apply_manifest(pp, catch_failures: true) Beaker::Host::CommandFailure: Host 'debian10-64-puppet7.example.com' exited with 6 running: puppet apply --verbose --detailed-exitcodes /tmp/apply_manifest_173415203.pp.LVEJBP Last 10 lines of output were: �[mNotice: /Stage[main]/Rabbitmq::Service/Service[rabbitmq-server]/ensure: ensure changed 'stopped' to 'running' Info: /Stage[main]/Rabbitmq::Service/Service[rabbitmq-server]: Unscheduling refresh on Service[rabbitmq-server] Error: Could not set 'present' on ensure: undefined method `[]' for nil:NilClass (file: /etc/puppetlabs/code/environments/production/modules/rabbitmq/manifests/init.pp, line: 584) Error: Could not set 'present' on ensure: undefined method `[]' for nil:NilClass (file: /etc/puppetlabs/code/environments/production/modules/rabbitmq/manifests/init.pp, line: 584) Wrapped exception: undefined method `[]' for nil:NilClass Error: /Stage[main]/Rabbitmq/Rabbitmq_cluster[rabbit_cluster]/ensure: change from 'absent' to 'present' failed: Could not set 'present' on ensure: undefined method `[]' for nil:NilClass (file: /etc/puppetlabs/code/environments/production/modules/rabbitmq/manifests/init.pp, line: 584) Info: Class[Rabbitmq]: Unscheduling all events on Class[Rabbitmq] Info: Stage[main]: Unscheduling all events on Stage[main] �[mNotice: Applied catalog in 7.51 seconds

Check failure on line 28 in spec/acceptance/clustering_spec.rb

View workflow job for this annotation

GitHub Actions / Puppet / Puppet 7 - Ubuntu 18.04

rabbitmq clustering rabbitmq::wipe_db_on_cookie_change => true runs successfully Failure/Error: apply_manifest(pp, catch_failures: true) Beaker::Host::CommandFailure: Host 'ubuntu1804-64-puppet7.example.com' exited with 6 running: puppet apply --verbose --detailed-exitcodes /tmp/apply_manifest_173413773.pp.2BI1to Last 10 lines of output were: �[mNotice: /Stage[main]/Rabbitmq::Service/Service[rabbitmq-server]/ensure: ensure changed 'stopped' to 'running' Info: /Stage[main]/Rabbitmq::Service/Service[rabbitmq-server]: Unscheduling refresh on Service[rabbitmq-server] Error: Could not set 'present' on ensure: undefined method `[]' for nil:NilClass (file: /etc/puppetlabs/code/environments/production/modules/rabbitmq/manifests/init.pp, line: 584) Error: Could not set 'present' on ensure: undefined method `[]' for nil:NilClass (file: /etc/puppetlabs/code/environments/production/modules/rabbitmq/manifests/init.pp, line: 584) Wrapped exception: undefined method `[]' for nil:NilClass Error: /Stage[main]/Rabbitmq/Rabbitmq_cluster[rabbit_cluster]/ensure: change from 'absent' to 'present' failed: Could not set 'present' on ensure: undefined method `[]' for nil:NilClass (file: /etc/puppetlabs/code/environments/production/modules/rabbitmq/manifests/init.pp, line: 584) Info: Class[Rabbitmq]: Unscheduling all events on Class[Rabbitmq] Info: Stage[main]: Unscheduling all events on Stage[main] �[mNotice: Applied catalog in 4.64 seconds
pp = <<-EOS
class { 'rabbitmq':
cluster => { 'name' => 'rabbit_cluster', 'init_node' => $facts['fqdn'] },
cluster => { 'name' => 'rabbit_cluster', 'init_node' => $facts['networking']['fqdn'] },
config_cluster => true,
cluster_nodes => ['rabbit1', 'rabbit2'],
cluster_node_type => 'ram',
Expand Down
2 changes: 1 addition & 1 deletion templates/rabbitmqadmin.conf.epp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ssl_cert_file = <%= $rabbitmq::config::ssl_management_cert %>
ssl_key_file = <%= $rabbitmq::config::ssl_management_key %>
port = <%= $rabbitmq::config::ssl_management_port %>
<% unless $rabbitmq::config::management_hostname {-%>
hostname = <%= $networking[fqdn] %>
hostname = <%= $facts['networking']['fqdn'] %>
<% } -%>
<% } else {-%>
port = <%= $rabbitmq::config::management_port %>
Expand Down

0 comments on commit 60f21f1

Please sign in to comment.