Merge pull request #985 from bastelfreak/puppet82

metadata.json: re-add Puppet 8 support
voxpupuli · May 19, 2024 · 3eb88dd · 3eb88dd
2 parents ed4d766 + 73d60aa
commit 3eb88dd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/lib/puppet/provider/rabbitmq_cluster/rabbitmqctl.rb b/lib/puppet/provider/rabbitmq_cluster/rabbitmqctl.rb
@@ -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(:networking)['fqdn']].include?(init_node)
       return rabbitmqctl('set_cluster_name', @resource[:name]) unless cluster_name == resource[:name].to_s
     else
       rabbitmqctl('stop_app')

diff --git a/metadata.json b/metadata.json
@@ -52,7 +52,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 7.0.0 < 8.0.0"
+      "version_requirement": ">= 7.0.0 < 9.0.0"
     }
   ],
   "dependencies": [

diff --git a/spec/acceptance/clustering_spec.rb b/spec/acceptance/clustering_spec.rb
@@ -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',
@@ -28,7 +28,7 @@ class { 'rabbitmq':
     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',

diff --git a/templates/rabbitmqadmin.conf.epp b/templates/rabbitmqadmin.conf.epp
@@ -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 %>