From: Mike Marchetti <mmarchetti@sandvine.com>
Date: Thu, 13 Sep 2018 19:35:42 +0000 (-0400)
Subject: Add regex search for '-' in juju controller name
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F83%2F6483%2F2;p=osm%2Fdevops.git

Add regex search for '-' in juju controller name

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

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 |