Move PostgreSQL to VMs and access via Zerotier #282

Merged
raucao merged 40 commits from feature/postgres_vms into master 2021-01-25 10:56:42 +00:00
Showing only changes of commit dd78b8cf7e - Show all commits

View File

@ -25,10 +25,16 @@ class Chef
def ip_for(server_node) def ip_for(server_node)
if node.chef_environment == "development" if node.chef_environment == "development"
server_node['network']['interfaces']['eth1']['routes'].first['src'] server_node['network']['interfaces']['eth1']['routes'].first['src']
else
# If the server has a private Zerotier IP, use it
if server_node['knife_zero'] && server_node['knife_zero']['host'] && \
server_node['knife_zero']['host'].start_with?("10.1.1.")
server_node['knife_zero']['host']
else else
server_node['ipaddress'] server_node['ipaddress']
end end
end end
end
def postgresql_service_name def postgresql_service_name
postgresql_version = "12" postgresql_version = "12"