From 9ea7b2b441dfa4cdb11e0030f629f4b36eafe3a7 Mon Sep 17 00:00:00 2001 From: Maria Haider Date: Mon, 28 Aug 2023 11:37:29 +0200 Subject: [PATCH] changed dockerhost manifest so that storage_driver is a variable --- global/overlay/etc/puppet/cosmos-rules.yaml | 1 + global/overlay/etc/puppet/modules/eid/manifests/dockerhost.pp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/global/overlay/etc/puppet/cosmos-rules.yaml b/global/overlay/etc/puppet/cosmos-rules.yaml index b368ae61..0c2493ec 100644 --- a/global/overlay/etc/puppet/cosmos-rules.yaml +++ b/global/overlay/etc/puppet/cosmos-rules.yaml @@ -424,6 +424,7 @@ country-test-1.test.komreg.net: autoupdate: eid::dockerhost: version: '5:24.0.5-1~ubuntu.20.04~focal' + storage_driver: 'overlay2' natmd-1.komreg.net: autoupdate: diff --git a/global/overlay/etc/puppet/modules/eid/manifests/dockerhost.pp b/global/overlay/etc/puppet/modules/eid/manifests/dockerhost.pp index 7aa64f74..aad2b7ff 100644 --- a/global/overlay/etc/puppet/modules/eid/manifests/dockerhost.pp +++ b/global/overlay/etc/puppet/modules/eid/manifests/dockerhost.pp @@ -6,6 +6,7 @@ class eid::dockerhost( String $compose_version = safe_hiera('eid_docker_compose_version'), String $docker_args = '', Optional[String] $docker_dns = undef, + $storage_driver = 'aufs', ) { if $version == 'NOT_SET_IN_HIERA' { fail('Docker version not set in Hiera') @@ -21,7 +22,7 @@ class eid::dockerhost( manage_dockerhost_unbound => true, docker_extra_parameters => $docker_args, docker_dns => $docker_dns, - storage_driver => 'aufs', + storage_driver => $storage_driver, docker_network => true, # let docker choose a network for the 'docker' bridge compose_version => $compose_version, }