From 762e7843b00ed5e4b1e77e5ebd877dd87dce841e Mon Sep 17 00:00:00 2001 From: Johan Wassberg Date: Tue, 26 Sep 2023 14:37:03 +0200 Subject: [PATCH 1/2] Required to validate feeds and aggregates --- manifests/metadata/mdqp.pp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifests/metadata/mdqp.pp b/manifests/metadata/mdqp.pp index 6b69308a4..da3c55665 100644 --- a/manifests/metadata/mdqp.pp +++ b/manifests/metadata/mdqp.pp @@ -4,6 +4,9 @@ Integer $runs_per_hour=4, String $mdq_service='https://mds.swamid.se', ) { + + ensure_resource('package',['jq','xmlstarlet '],{ensure => present}) + $image_tag = "docker.sunet.se/mdqp:${imagetag}" docker::image { $image_tag : # make it possible to use the same docker image more than once on a node ensure => 'present', From f559412b244c6bfaab05a199cc34aa1181f5273c Mon Sep 17 00:00:00 2001 From: Johan Wassberg Date: Thu, 28 Sep 2023 09:40:36 +0200 Subject: [PATCH 2/2] Avoid clashes with other classes install packages Idea from kano --- manifests/metadata/mdqp.pp | 3 ++- manifests/packages/xmlstarlet.pp | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 manifests/packages/xmlstarlet.pp diff --git a/manifests/metadata/mdqp.pp b/manifests/metadata/mdqp.pp index da3c55665..b1405807e 100644 --- a/manifests/metadata/mdqp.pp +++ b/manifests/metadata/mdqp.pp @@ -5,7 +5,8 @@ String $mdq_service='https://mds.swamid.se', ) { - ensure_resource('package',['jq','xmlstarlet '],{ensure => present}) + include sunet::package::jq + include sunet::package::xmlstarlet $image_tag = "docker.sunet.se/mdqp:${imagetag}" docker::image { $image_tag : # make it possible to use the same docker image more than once on a node diff --git a/manifests/packages/xmlstarlet.pp b/manifests/packages/xmlstarlet.pp new file mode 100644 index 000000000..852078131 --- /dev/null +++ b/manifests/packages/xmlstarlet.pp @@ -0,0 +1,3 @@ +class sunet::packages::xmlstarlet { + package { 'xmlstarlet': ensure => installed } +}