From 1a82e9060738ff3f4f09282125b8bdf75a304470 Mon Sep 17 00:00:00 2001 From: Johan Wassberg Date: Tue, 27 Feb 2024 13:36:51 +0100 Subject: [PATCH] Access all cluster nodes --- global/overlay/etc/puppet/modules/eid/manifests/idm_app.pp | 4 +++- .../overlay/etc/puppet/modules/eid/templates/idm/idm.yml.erb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/global/overlay/etc/puppet/modules/eid/manifests/idm_app.pp b/global/overlay/etc/puppet/modules/eid/manifests/idm_app.pp index e51093ca..264548eb 100644 --- a/global/overlay/etc/puppet/modules/eid/manifests/idm_app.pp +++ b/global/overlay/etc/puppet/modules/eid/manifests/idm_app.pp @@ -3,7 +3,9 @@ class eid::idm_app ( ) { $redises = lookup('redis_cluster_nodes', undef, undef, []) - $dbs = lookup('sql_cluster_nodes', undef, undef, undef) + $dbs = lookup('mariadb_cluster_nodes', undef, undef, []) + $dbs_string = join($dbs,',') + $sql_password = lookup('sql_password', undef, undef, undef) ensure_resource('sunet::misc::create_dir', '/opt/idm_app/config/', { owner => 'root', group => 'root', mode => '0750'}) diff --git a/global/overlay/etc/puppet/modules/eid/templates/idm/idm.yml.erb b/global/overlay/etc/puppet/modules/eid/templates/idm/idm.yml.erb index 7f01846f..d15e5bc4 100644 --- a/global/overlay/etc/puppet/modules/eid/templates/idm/idm.yml.erb +++ b/global/overlay/etc/puppet/modules/eid/templates/idm/idm.yml.erb @@ -40,6 +40,6 @@ spring: password: qwerty123 datasource: - url: jdbc:mariadb:loadbalance://<%= @dbs %>/idm + url: jdbc:mariadb:loadbalance://<%= @dbs_string %>/idm username: idm password: <%= scope.call_function('safe_hiera', ['sql_password']) %>