running new MDQ in natmd-test-2 and natpub-test-2

global/overlay/etc/puppet/cosmos-rules.yaml

@@ -587,14 +587,24 @@ natmd-test-2.komreg.net:
    autoupdate:
    eid::dockerhost:
       version: '5:23.0.6-1~ubuntu.20.04~focal'
-   md_signer:
-      name: natmd-test
-      dest_host: natpub-test-2.komreg.net
-      version: 1.1.5-eidas
+      docker_repo: stable
    metadatamgrs:
    konsulter:
-   eidas_hsm_client:
-   md_repo_client:
+   sunet::metadata::pyff_compose:
+      pyff_imagetag: swamid-2023-05-08
+      pyff_pipeline: natmd-test-ng.fd
+      pyff_update_frequency: 1800
+      pyff_extra_volumes:
+        - "/etc/credentials:/etc/credentials"
+      hsm_client: true
+      luna_imagetag: 7.4-dev
+   sunet::metadata::mdqp:
+      imagetag: v2023-05-17-01
+      mdq_service: http://pyff_pyff_1:8080
+   sunet::metadata::metadata_repo:
+      hostname: r1.komreg.net
+      repo: komreg-metadata.git
+      signed_repo: true
 
 eumd-2.komreg.net:
    sunetops:
@@ -639,12 +649,15 @@ natpub-2.komreg.net:
          port: '443'
 
 natpub-test-2.komreg.net:
-   sunetops:
+   sunetops_new:
    autoupdate:
-   metadatamgrs:
-   md_publisher:
-     keyname: natpub-test-2.komreg.net_infra
-     signer_ip_adress: '89.45.237.80'
+   eid::dockerhost:
+      version: '5:23.0.6-1~ubuntu.20.04~focal'
+   metadatamgrs_new:
+   sunet::metadata::mdq_publisher:
+      valid_until: 7
+      xml_dir: role
+      validate_cert: '/var/www/html/md-signer.crt'
    sunet::frontend::register_sites:
      sites:
        'test.md.swedenconnect.se':