swedenconnect/eid-ops
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changed dockerhost manifest so that storage_driver is a variable

Browse source
This commit is contained in:
Maria Haider 2023-08-28 11:37:29 +02:00
parent 366d5d1d8b
commit 9ea7b2b441
Signed by: mariah
GPG key ID: 7414A760CA747E57
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
global/overlay/etc/puppet/cosmos-rules.yaml
View file

@ -424,6 +424,7 @@ country-test-1.test.komreg.net:
autoupdate: autoupdate:
eid::dockerhost: eid::dockerhost:
version: '5:24.0.5-1~ubuntu.20.04~focal' version: '5:24.0.5-1~ubuntu.20.04~focal'
storage_driver: 'overlay2'
natmd-1.komreg.net: natmd-1.komreg.net:
autoupdate: autoupdate:

3
global/overlay/etc/puppet/modules/eid/manifests/dockerhost.pp
View file

@ -6,6 +6,7 @@ class eid::dockerhost(
String $compose_version = safe_hiera('eid_docker_compose_version'), String $compose_version = safe_hiera('eid_docker_compose_version'),
String $docker_args = '', String $docker_args = '',
Optional[String] $docker_dns = undef, Optional[String] $docker_dns = undef,
$storage_driver = 'aufs',
) { ) {
if $version == 'NOT_SET_IN_HIERA' { if $version == 'NOT_SET_IN_HIERA' {
fail('Docker version not set in Hiera') fail('Docker version not set in Hiera')
@ -21,7 +22,7 @@ class eid::dockerhost(
manage_dockerhost_unbound => true, manage_dockerhost_unbound => true,
docker_extra_parameters => $docker_args, docker_extra_parameters => $docker_args,
docker_dns => $docker_dns, docker_dns => $docker_dns,
storage_driver => 'aufs', storage_driver => $storage_driver,
docker_network => true, # let docker choose a network for the 'docker' bridge docker_network => true, # let docker choose a network for the 'docker' bridge
compose_version => $compose_version, compose_version => $compose_version,
} }