From dfa03b704062b4c698a564804dbb7b4d312ca5e5 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Tue, 21 Sep 2021 12:34:01 +0200 Subject: [PATCH] removed old secrets file, added new secrets upgraded docker version updated URL for OS image --- .../overlay/etc/hiera/data/local.eyaml | 29 +++++++++++++++++++ .../overlay/etc/hiera/data/secrets.yaml.asc | 28 ------------------ global/overlay/etc/puppet/cosmos-rules.yaml | 2 ++ 3 files changed, 31 insertions(+), 28 deletions(-) create mode 100644 eumd-1.komreg.net/overlay/etc/hiera/data/local.eyaml delete mode 100644 eumd-1.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc diff --git a/eumd-1.komreg.net/overlay/etc/hiera/data/local.eyaml b/eumd-1.komreg.net/overlay/etc/hiera/data/local.eyaml new file mode 100644 index 00000000..57e485dc --- /dev/null +++ b/eumd-1.komreg.net/overlay/etc/hiera/data/local.eyaml @@ -0,0 +1,29 @@ + + +pkcs11pin: ENC[PKCS7,MIICzwYJKoZIhvcNAQcDoIICwDCCArwCAQAxggJnMIICYwIBADBLMD4xCzAJBgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxDzANBgNVBAMMBmV1bWQtMQIJAI9AFybECEn3MA0GCSqGSIb3DQEBAQUABIICAKnlUuDgM/OeHLVUJnt7oyWdpNyVxN94zOlqapKx+tjJRAMRneEhJgZGReTwnOKTg+eTGtDvMknUGpuMtLwUn4kXs413dCCfnwl3JkBVXKpNA8K/gaSFJLC+2HLhdL0kWnhqCP/PDBwgohlLNoCNZHNRlU0fp/AjYkWNZsr88Tm1PfUDByk16daqJfKODJ5K9MYJO5C4Ck0cjVuIRmp3rZw6VsSaeGZVIuMflgv/ykguOxbOKw2mK0O4hBuVsF6Nt3y3WH54FeXzOi0lk/XORA/eMNu2Q9o7/7JcTAs10vNKEgDlidIRGIyKelbTT6xv5JDLDCG1388T5oMlNegmL/UPFYN/B5sJSHmW13mSZxKyK+3CLdw9ovVHl1PdszPMT+y0ft/jHTOW9TKQ753u4TmCiKBamy9YBkhQQv0P5G6q/aBbX15fEmbR7lOeRetAkC7NBIjd8dOKUW7S9+SFm0VSO5JtAUBM2reIcsZKZdYNoBE1zXNruP97LlP10g9RpzWx5ZaSvSG/nTSwJzWXZiy6t3FPuJMtZx6qdzfsVsvC3F3WVajdGazz9xi8GaifDLuWhoQH4izjwm7SLjOgnzTGRB4malS0CgfoepJB09w4DZ62yDRCJM8Ec44G/4Zjjh8ktQ7Hafjck3lNfrC19GJiBVL/l5GroH1hLDQAUDWxMEwGCSqGSIb3DQEHATAdBglghkgBZQMEASoEEP+nn6ylaSpiThJiTmhSDx6AIN6xjLFRgHOnNW6dYM6uRDuRG9iDPXFrv021NurYL/R4] +publisher_ssh_privkey: > + ENC[PKCS7,MIIEQwYJKoZIhvcNAQcDoIIENDCCBDACAQAxggJnMIICYwIBADBLMD4xCzAJ + BgNVBAYTAlNFMQ4wDAYDVQQKDAVTVU5FVDEOMAwGA1UECwwFRVlBTUwxDzAN + BgNVBAMMBmV1bWQtMQIJAI9AFybECEn3MA0GCSqGSIb3DQEBAQUABIICABum + MRaeuXlGl1gnqeeSWDmEKJIbXp+caZ1S+kxtldMXrldpkk2NXyCnrCizbNyC + R2yyDfQj8F3RvSh9kY56ajQmgxpp+5tTFKDKjjNoSxeppeqZlcZ4u+hRiqlk + nCRgxPLuXN9ZDBYEOLuZ9S95+KMHmlqfIHa4Ugw7iMj2iNk4aIKhgK2eJnvW + K7ajPElZYxkfqOn60K+E80AAo7gGSx9vR5N+G2K9IywiVUg+l3lEILeyOHAi + 3RnCF6Wy4hiHMJGdImXBHyF0ZXKXYjZV3S58wqh4kqT62R8JKteAl5XqR/BL + JR4c4Il+axOPJ3F/Lq2j6LZsJ8prjrqgyy1WHzYP4ZrIvqob56AU9M/jZXKs + /Z4pe5NnDSRtCRLQKgmv0V5OyUFaU1f6PDTSbXqwq4tbdoMVxiER/O5CoxE0 + 7VN3Dl7LzkSksOLh0nVFnrCVhy4C2DhDRwQRyTJY/SWDMc3UAvbdxJS53xbb + zjsK9qrBrWHd/EXd/7zkm2pHegOLkSltYW8Z6ngnEbwjES3I1UJjfDzj/iBp + fxQs3O6dGGfNei99YWU7GiJHbxURDyim4uLNUsFD2jxW72U2rqmYBviHdgcB + Y1W7jjHZRz/3JG6qxEtGxOgirfyuqyvZnMD8CsvppadO8gYd2S2h8b/k42nF + 6Isk8VskXHa8OtdjqPB0MIIBvgYJKoZIhvcNAQcBMB0GCWCGSAFlAwQBKgQQ + uQE8se/4oWOMKAFW+nFO6oCCAZAP0xQ+CkgsaNoHjKtXUP656938K6+ac0Pa + BAMbVnWv0ClRA8LsaY4OFSiSjmagc626H3+ZSxR9M60tKrpbI7AwwxUEIfU3 + 590d6XrtidwQJtvtpnwWSfMRgZ0e38biJ7483/p/RnRRxagzgDYsWHDhFw9q + x8Tqh6JWmOpuCJFIuaeEaNqS+Fskb7apL61hWQiNOjgFpo0jY5KfW+19qyZ1 + Nt0m3c2ROC/yd1LfCpR1GDEMOIsU8ZNEj0htxMQqxE8OkfjuKK88wHgxf/cD + +W1nNPSv4kpYfGFmLl/howITjKlAoSSVIaKt59kXcUWhWJHkh35Gnyfz1LZW + TEvEqhBKi7gkhZtEjveQhc/+IY4MQKLaRPBBTr2hRVkqkdk89SnSJpN+Iovw + Vv8H02IqGaRacQTkmdqrkr7dq0ZU5k45DMrIJFUjtEn7Idc58Esiwc4dp0lx + pAG9iGD8n0j6+CzbcY8HngH841uMr0X6Hatr3GeV9h5BlYwCQ/C4YDFCtCwP + KO6NAlJfKEiTYkFlmBIh] diff --git a/eumd-1.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc b/eumd-1.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc deleted file mode 100644 index 6a1b3e30..00000000 --- a/eumd-1.komreg.net/overlay/etc/hiera/data/secrets.yaml.asc +++ /dev/null @@ -1,28 +0,0 @@ -STATUS=UPDATED - ------BEGIN PGP MESSAGE----- -Version: GnuPG v2 - -hQEMA/UK8g1XOW7bAQf/TQIwYOck4L7AEV7mMej+g7gtLjEvuJ/tyj0A1bsEl72V -wexnwnG15uf1KFnlfJHBbN8YuaOEQZrC9V+vkCR3WRIYnhnC9HBx3ys3lHoLR3ZU -8K6y6wmvVkMKdOca3Eur72bxo941JHEGzLh7g4gqdbrHDLi40dpamFQSv8lmGT5L -XSCOGJxdap9JrbxreUOxX9usreUygRzlzRt+jJiS/XYRPkdAAdIA7exMpDtYU6tN -NzzCFWgQ2JV45qVT0aMtC3pcXxx3euijyfcXFNdTqBUhhe1V+BUp9YVXSZhkf9GH -jtSHJ4VPE2tjJJc0DxpyzJ6oATjPPeOEjWIq0HBq/dLpAVDieZD1Qr/SohZ8ywa5 -XHVkZ3QdViFEtOmdZUOodkSQBzcN1iRJJA+rF+uBvlVGLpqxIi0cutZXxWhBLdLJ -+qldJFCORh6MmlPVVEtzSI3Y+AEz0h41NOGquGiK2qRvIAhdgjNzbWj+SKXfxkUq -bIc+UWZ4aCWPkPTX4W4SJII/xUHJ0h9df4jDc2zIKpqLZE0kcxzxDR2ZlC4r3eau -i3l/9XWU0OBBiZwl10j55RIHxJDtMyrmSDJfY+fcjen0QWFWM4LTdfnMLOTB1pPP -MCGQR0RbQGskrSBn8JXP4BX1hIdwzErDoLADKJwLvy9F8Ybqd/J6i58pkQugeLjD -eOz62zuIeRUtPV0EdmlXslMRWVy5uxW/GZbLqv8xea9P04KB/yJSDeRKK/cMCqRa -RjGcvJU2F58GsVoq/oobIM8EjtVIjX0Cn+/42Zus8t824lrcHfojiTtGGomXMamA -8MufR+S8Xlemsbwxvkd9C2Qz/Q61jUynqv/YscN8AV7s9fEBWlktsp/qeA3kXAWM -7PjIf1awfPdJtTnOuavyzsobA4fgaM2/e61lXZp5sadXpXkcc7oyoE2XDYLXs4Tl -3BsGOOK5C9lakC5XkRyt9pNkyRfgdpBmpkpgGamfjPJPA0vchepbVoCLYl0KkRzi -tkQCg0FarVmNv4koZRQkiVLAF9RSjWJo5I5RS7Cwoo5OYf67j1coEVgwGirxIbes -xCvSCAu9Nx882UJ06CAUFe35mH6dSq+6ujgFGRK3+Z3uJtEnCBIcLaNF3LKz5kkZ -ExA6ZGuBQkF5ueuh6K3Twyp4FOZg1nNAPPBkl9EP8coW1pp/XyY9x7lAOD4GMNPr -DcTUffqAV1h0tby7DOEv4orano4NPPHR+e22GBDJgM6YbfjPLdKNwny+cOPM4Pam -aVYfg4tpE1R/DcaEj1iEDivt9zIDhTXiXYgwWzdtnfoS4fMikrk5xsSp -=8C2d ------END PGP MESSAGE----- diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index b6f44d7d..3e685042 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -284,6 +284,7 @@ kvmmeta-fre-3.komreg.net: description: 'eid fre european metadata signer' cpus: '10' memory: '15360' + image_url: 'https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img' natpub-1.komreg.net: mac: '52:54:20:01:01:03' ip: '94.176.224.199' @@ -462,6 +463,7 @@ natmd-1.komreg.net: eumd-1.komreg.net: autoupdate: eid::dockerhost: + version: '5:20.10.8~3-0~ubuntu-bionic' metadatamgrs: konsulter: eidas_hsm_client: