From: David Garcia <david.garcia@canonical.com>
Date: Tue, 26 May 2020 11:50:54 +0000 (+0200)
Subject: Pin juju version to 2.8.1 and minor fixes in installer
X-Git-Tag: v7.1.0rc3~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F68%2F8968%2F1;p=osm%2Fdevops.git

Pin juju version to 2.8.1 and minor fixes in installer

Change-Id: Icc13bf72b664bad928d90e040f2ce55608dad759
Signed-off-by: David Garcia <david.garcia@canonical.com>
---

diff --git a/docker/LCM/Dockerfile b/docker/LCM/Dockerfile
index a18bcc92..de8a713d 100644
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -47,7 +47,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y git make
     && python3 -m pip install -U pip \
     && python3 -m pip install -U aiokafka lxml six enum34 \
     && python3 -m pip install requests \
-    && python3 -m pip install -U juju \
+    && python3 -m pip install -U "juju==2.8.1" \
     && rm -rf /var/lib/apt/lists/*
 
 # RUN git clone https://osm.etsi.org/gerrit/osm/N2VC.git \
diff --git a/docker/MON/Dockerfile b/docker/MON/Dockerfile
index 95050342..22451fcc 100644
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -61,7 +61,7 @@ RUN curl ${REPOSITORY_BASE}/${RELEASE}/${REPOSITORY_KEY} | apt-key add - \
                           python3-n2vc${N2VC_VERSION}
 
 
-RUN python3 -m pip install -U juju
+RUN python3 -m pip install -U "juju==2.8.1"
 
 COPY scripts/ scripts/
 
diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index eb809d1d..78a1e127 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -236,7 +236,7 @@ function install_microstack() {
     ubuntu1604
     ssh-keygen -t rsa -N "" -f ~/.ssh/microstack
     microstack.openstack keypair create --public-key ~/.ssh/microstack.pub microstack
-    export OSM_HOSTNAME=`juju status --format yaml | yq r - applications.nbi-k8s.address`
+    export OSM_HOSTNAME=`juju status --format yaml | yq -r '.applications["nbi-k8s"].address'`
     osm vim-create --name microstack-site \
     --user admin \
     --password keystone \
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index eaf79d7c..01a1bb26 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -1417,7 +1417,7 @@ if [ -n "$CHARMED" ]; then
      echo
      echo "1. Get the NBI IP with the following command:"
      echo
-     echo "juju status --format yaml | yq r - applications.nbi-k8s.address"
+     echo "juju status --format yaml | yq -r '.applications[\"nbi-k8s\"].address'"
      echo
      echo "2. Create the OSM_HOSTNAME environment variable with the NBI IP"
      echo