Commit a4a1fd60 authored by Zen Fu's avatar Zen Fu
Browse files

Fix $extra_volumes type once again (sysadmin#17870)

Last attempt (08f31a3f) fixed
compilation bug generated a bug because an empty string was generating
an extra --volume parameter on container creation.

Now we move back to using an Array and fix our deploy script
accordingly.
parent 87d4f4d0
Pipeline #3049 failed with stage
in 2 minutes and 33 seconds
......@@ -41,8 +41,8 @@ deploy_application() {
# written: a container service reload is attempted before systemd is
# actually aware of the newly created `podman-weblate.service` unit
# file.
${PUPPET_APPLY} -e "include apt; class { 'tails::weblate': podman_extra_volumes => '${SCRIPTS_DIR}:/scripts:Z' }"
${PUPPET_APPLY} -e "include apt; class { 'tails::weblate': podman_extra_volumes => '${SCRIPTS_DIR}:/scripts:Z' }"
${PUPPET_APPLY} -e "include apt; class { 'tails::weblate': podman_extra_volumes => ['${SCRIPTS_DIR}:/scripts:Z'] }"
${PUPPET_APPLY} -e "include apt; class { 'tails::weblate': podman_extra_volumes => ['${SCRIPTS_DIR}:/scripts:Z'] }"
}
wait_for_application() {
......
......@@ -5,7 +5,7 @@ class tails::weblate (
String $weblate_admin_password,
String $weblate_secret_key,
String $redis_password,
String $podman_extra_volumes = '', # Used for testing purposes.
Array[String] $podman_extra_volumes = [], # Used for testing purposes.
) inherits tails::weblate::params {
### Sanity checks
......
......@@ -20,7 +20,7 @@ class tails::weblate::podman (
String $redis_host = '10.0.2.2',
String $redis_port = '6379',
String $redis_db = '1',
String $extra_volumes = [], # Used for testing purposes
Array[String] $extra_volumes = [], # Used for testing purposes
) inherits tails::weblate::params {
class { 'podman':
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment