Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
cookbook-rb-manager CHANGELOG
===============

## 5.17.3

- nilsver
- [1e5a1ab] remove dependency on serf

## 5.17.2

- Pablo Pérez
Expand Down
20 changes: 4 additions & 16 deletions resources/libraries/set_internal_vip.rb
Original file line number Diff line number Diff line change
@@ -1,20 +1,8 @@
module RbManager
module Helpers
def find_vip_from_serf
postgresql_master_node = node['redborder']['managers_per_services']['postgresql'].first
serf_output = `serf members`

master_ip = serf_output.lines.find do |line|
next unless line.include?('alive')

node_name = line.split[0]
node_name == postgresql_master_node
end

return unless master_ip

ip_part = master_ip.split[1]
ip_part&.split(':')&.first
def find_ip_of_master_node
postgres_ips = node['redborder']['cluster_info'].select { |m, _| node['redborder']['managers_per_services']['postgresql'].include?(m) }.map { |_, v| v['ipaddress_sync'] }
postgres_ips.first
end

def update_hosts_file(hosts_file, master_vip, service, vip)
Expand All @@ -39,7 +27,7 @@ def update_hosts_file(hosts_file, master_vip, service, vip)

def set_internal_vip(vip, service)
etc_hosts_updated = false
master_vip = vip || find_vip_from_serf
master_vip = vip || find_ip_of_master_node
etc_hosts_updated = update_hosts_file('/etc/hosts', master_vip, service, vip) if master_vip
etc_hosts_updated
end
Expand Down
2 changes: 1 addition & 1 deletion resources/metadata.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
maintainer_email '[email protected]'
license 'AGPL-3.0'
description 'Installs/Configures redborder manager'
version '5.17.2'
version '5.17.3'

depends 'rb-common'
depends 'chef-server'
Expand Down
1 change: 0 additions & 1 deletion resources/recipes/configure.rb
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@
if manager_services['postgresql'] && external_services&.dig('postgresql') == 'onpremise'
cdomain node['redborder']['cdomain']
ipaddress node['ipaddress_sync']
postgresql_hosts node['redborder']['managers_per_services']['postgresql']
action [:add, :register]
elsif !external_services.nil?
action [:remove, :deregister]
Expand Down