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 a18bcc9..de8a713 100644
--- a/docker/LCM/Dockerfile
+++ b/docker/LCM/Dockerfile
@@ -47,7 +47,7 @@
&& 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 9505034..22451fc 100644
--- a/docker/MON/Dockerfile
+++ b/docker/MON/Dockerfile
@@ -61,7 +61,7 @@
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 eb809d1..78a1e12 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -236,7 +236,7 @@
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 eaf79d7..01a1bb2 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -1417,7 +1417,7 @@
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