From fcd7019bb73daced6919a4c2b4b671283b7a1eaf Mon Sep 17 00:00:00 2001 From: Casper Bruun Date: Tue, 9 Aug 2016 13:41:19 +0200 Subject: [PATCH] Allow underscore in sanitised names --- manifests/exec.pp | 2 +- manifests/run.pp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/exec.pp b/manifests/exec.pp index 48d4441ef..acffd8b7d 100644 --- a/manifests/exec.pp +++ b/manifests/exec.pp @@ -31,7 +31,7 @@ if $sanitise_name { - $sanitised_container = regsubst($container, '[^0-9A-Za-z.\-]', '-', 'G') + $sanitised_container = regsubst($container, '[^0-9A-Za-z.\-_]', '-', 'G') } else { $sanitised_container = $container } diff --git a/manifests/run.pp b/manifests/run.pp index 03f8dbe11..085cc6458 100755 --- a/manifests/run.pp +++ b/manifests/run.pp @@ -193,19 +193,19 @@ volumes_from => any2array($volumes_from), }) - $sanitised_title = regsubst($title, '[^0-9A-Za-z.\-]', '-', 'G') + $sanitised_title = regsubst($title, '[^0-9A-Za-z.\-_]', '-', 'G') if empty($depends_array) { $sanitised_depends_array = [] } else { - $sanitised_depends_array = regsubst($depends_array, '[^0-9A-Za-z.\-]', '-', 'G') + $sanitised_depends_array = regsubst($depends_array, '[^0-9A-Za-z.\-_]', '-', 'G') } if empty($after_array) { $sanitised_after_array = [] } else { - $sanitised_after_array = regsubst($after_array, '[^0-9A-Za-z.\-]', '-', 'G') + $sanitised_after_array = regsubst($after_array, '[^0-9A-Za-z.\-_]', '-', 'G') } if $restart {