Merge branch 'master' of gitops.sunet.se:eid-ops

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:

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)