From 634e6398c7287388bfb82a8d133c40730fd9bd23 Mon Sep 17 00:00:00 2001 From: Johan Wassberg Date: Mon, 22 Jan 2024 10:21:56 +0100 Subject: [PATCH] Get config from hiera --- global/overlay/etc/puppet/cosmos-rules.yaml | 12 ------------ .../etc/puppet/modules/eid/manifests/idm_db.pp | 2 -- idm-test-common/overlay/etc/hiera/data/group.yaml | 5 +++++ 3 files changed, 5 insertions(+), 14 deletions(-) create mode 100644 idm-test-common/overlay/etc/hiera/data/group.yaml diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index f294d7b4..28a44d03 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -1180,25 +1180,13 @@ idm-sto1-test-db-1\.komreg\.net: autoupdate: sunet::dockerhost2: eid::idm_db: - cluster_nodes: - - 89.47.184.180 - - 89.47.185.105 - - 89.45.236.171 idm-sto1-test-db-2\.komreg\.net: autoupdate: sunet::dockerhost2: eid::idm_db: - cluster_nodes: - - 89.47.184.180 - - 89.47.185.105 - - 89.45.236.171 idm-sto3-test-db-3\.komreg\.net: autoupdate: sunet::dockerhost2: eid::idm_db: - cluster_nodes: - - 89.47.184.180 - - 89.47.185.105 - - 89.45.236.171 diff --git a/global/overlay/etc/puppet/modules/eid/manifests/idm_db.pp b/global/overlay/etc/puppet/modules/eid/manifests/idm_db.pp index 7daf15fc..c85461df 100644 --- a/global/overlay/etc/puppet/modules/eid/manifests/idm_db.pp +++ b/global/overlay/etc/puppet/modules/eid/manifests/idm_db.pp @@ -1,9 +1,7 @@ # idm_db class eid::idm_db ( - Array $cluster_nodes, ) { sunet::mariadb { 'idm_db': - cluster_nodes => $cluster_nodes, } } diff --git a/idm-test-common/overlay/etc/hiera/data/group.yaml b/idm-test-common/overlay/etc/hiera/data/group.yaml new file mode 100644 index 00000000..5e56efa5 --- /dev/null +++ b/idm-test-common/overlay/etc/hiera/data/group.yaml @@ -0,0 +1,5 @@ +#mariadb_clients=[] +mariadb_cluster_nodes: + - 89.47.184.180 + - 89.47.185.105 + - 89.45.236.171