Skip to content

Commit 47bdec7

Browse files
committed
remove dependency on serf
1 parent 0316a62 commit 47bdec7

File tree

3 files changed

+6
-18
lines changed

3 files changed

+6
-18
lines changed

resources/libraries/helper.rb

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,12 @@ def local_routes
1414
routes
1515
end
1616

17-
# Queries Serf members to find the master node's IP.
18-
def find_master_ip_from_serf(postgresql_hosts)
19-
postgresql_master_node = postgresql_hosts.first
20-
serf_output = `serf members`
17+
def find_master_ip
18+
postgres_ips = node['redborder']['cluster_info']
19+
.select { |m, _| node['redborder']['managers_per_services']['postgresql'].include?(m) }
20+
.map { |_, v| v['ipaddress_sync'] }
2121

22-
master_ip = serf_output.lines.find do |line|
23-
next unless line.include?('alive')
24-
25-
node_name = line.split[0]
26-
node_name == postgresql_master_node
27-
end
28-
29-
return unless master_ip
30-
31-
ip_part = master_ip.split[1]
32-
ip_part&.split(':')&.first
22+
postgres_ips.first
3323
end
3424
end
3525
end

resources/providers/config.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
action :add do
77
begin
88
user = new_resource.user
9-
postgresql_hosts = new_resource.postgresql_hosts
109
routes = local_routes
1110

1211
dnf_package 'postgresql' do
@@ -42,7 +41,7 @@
4241

4342
ruby_block 'sync_if_not_master' do
4443
block do
45-
master_ip = find_master_ip_from_serf(postgresql_hosts)
44+
master_ip = find_master_ip
4645
if master_ip
4746
local_ips = `hostname -I`.split
4847
unless local_ips.include?(master_ip)

resources/resources/config.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,3 @@
88
attribute :postgresql_port, kind_of: Integer, default: 5432
99
attribute :cdomain, kind_of: String, default: 'redborder.cluster'
1010
attribute :ipaddress, kind_of: String, default: '127.0.0.1'
11-
attribute :postgresql_hosts, kind_of: Array, default: []

0 commit comments

Comments
 (0)