From 2fafbbaeaed2843261372394da33b006b2f5a699 Mon Sep 17 00:00:00 2001 From: Mike Marchetti Date: Thu, 13 Sep 2018 15:35:42 -0400 Subject: [PATCH] Add regex search for '-' in juju controller name Change-Id: Ibd954a88ec2907b545db6847dfb1b39232d709ee Signed-off-by: Mike Marchetti --- installers/full_install_osm.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index 60a99e3f..0a14e9d2 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -84,7 +84,7 @@ function uninstall(){ function parse_juju_password { password_file="${HOME}/.local/share/juju/accounts.yaml" local controller_name=$1 - local s='[[:space:]]*' w='[a-zA-Z0-9_]*' fs=$(echo @|tr @ '\034') + local s='[[:space:]]*' w='[a-zA-Z0-9_-]*' fs=$(echo @|tr @ '\034') sed -ne "s|^\($s\):|\1|" \ -e "s|^\($s\)\($w\)$s:$s[\"']\(.*\)[\"']$s\$|\1$fs\2$fs\3|p" \ -e "s|^\($s\)\($w\)$s:$s\(.*\)$s\$|\1$fs\2$fs\3|p" $password_file | -- 2.25.1