From 67f5b9253733f04c3339e027217967390f0213cd Mon Sep 17 00:00:00 2001 From: Johan Wassberg Date: Tue, 16 Jan 2024 14:37:10 +0100 Subject: [PATCH 1/2] Trying stuff --- global/overlay/etc/puppet/cosmos-rules.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 02a63da7..6d2f4980 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -1176,6 +1176,6 @@ eidastest-1.qa.sveidas.se: idm-sto3-test-db-3\.komreg\.net: sunet::dockerhost: write_daemon_config: true - docker_dns: 89.32.32.32 + # docker_dns: 89.32.32.32 advanced_network: true eid::idm_db: From 52a4af8eeed2c87c8ee70fc50d3ff04842c4b21e Mon Sep 17 00:00:00 2001 From: Johan Wassberg Date: Wed, 17 Jan 2024 13:38:24 +0100 Subject: [PATCH 2/2] Test new stuff --- global/overlay/etc/puppet/cosmos-rules.yaml | 6 +----- global/overlay/etc/puppet/setup_cosmos_modules | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index 6d2f4980..55b43c36 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -1174,8 +1174,4 @@ eidastest-1.qa.sveidas.se: ssh_allow_from_anywhere: false idm-sto3-test-db-3\.komreg\.net: - sunet::dockerhost: - write_daemon_config: true - # docker_dns: 89.32.32.32 - advanced_network: true - eid::idm_db: + sunet::dockerhost2: diff --git a/global/overlay/etc/puppet/setup_cosmos_modules b/global/overlay/etc/puppet/setup_cosmos_modules index 702ae397..2159d9f1 100755 --- a/global/overlay/etc/puppet/setup_cosmos_modules +++ b/global/overlay/etc/puppet/setup_cosmos_modules @@ -208,7 +208,7 @@ def main(): if re.match('^idm-sto\d-test-', host_info["fqdn"]): - modules["sunet"]["tag"] = "jocar-idm-*" + modules["sunet"]["tag"] = "jocar-dockerhost2-*" # Build list of expected file content file_lines = create_file_content(modules)