commit 2fafbbaeaed2843261372394da33b006b2f5a699
author Mike Marchetti <mmarchetti@sandvine.com> Thu Sep 13 15:35:42 2018 -0400
committer marchettim <mmarchetti@sandvine.com> Thu Sep 13 20:36:20 2018 +0100
tree 7d079a13fb69a8a42a172cc48741287bd12e4a5f
parent bf47e150aa877a0525cf30fb633f613dae6feb3b

Add regex search for '-' in juju controller name

Change-Id: Ibd954a88ec2907b545db6847dfb1b39232d709ee
Signed-off-by: Mike Marchetti <mmarchetti@sandvine.com>

installers/full_install_osm.sh

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 60a99e3..0a14e9d 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -84,7 +84,7 @@
 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 |