From: madavi <jm00553988@techmahindra.com>
Date: Tue, 10 Sep 2019 09:32:34 +0000 (+0200)
Subject: Merge "RO, NBI, LCM and osmclient: Update pip to latest version"
X-Git-Tag: v7.0.0rc1~69
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=d3dd343665385d6f6ce7d0b37950857b87b5bc09;hp=-c;p=osm%2Fdevops.git

Merge "RO, NBI, LCM and osmclient: Update pip to latest version"
---

d3dd343665385d6f6ce7d0b37950857b87b5bc09
diff --combined installers/full_install_osm.sh
index 167ca87b,35c8706b..be160d65
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@@ -544,8 -544,8 +544,8 @@@ function install_osmclient()
      sudo add-apt-repository -y "deb [arch=amd64] $CLIENT_REPOSITORY_BASE/$CLIENT_RELEASE $CLIENT_REPOSITORY osmclient"
      sudo apt-get update
      sudo apt-get install -y python-pip
-     sudo -H LC_ALL=C pip install pip==9.0.3
-     sudo -H LC_ALL=C pip install python-magic
+     sudo -H LC_ALL=C pip install -U pip
+     sudo -H LC_ALL=C python -m pip install python-magic
      sudo apt-get install -y python-osmclient
      #sed 's,OSM_SOL005=[^$]*,OSM_SOL005=True,' -i ${HOME}/.bashrc
      #echo 'export OSM_HOSTNAME=localhost' >> ${HOME}/.bashrc
@@@ -630,7 -630,7 +630,7 @@@ function install_docker_compose() 
  
  function install_juju() {
      echo "Installing juju"
 -    sudo snap install juju --classic
 +    sudo snap install juju --classic --channel=2.5/stable
      [ -z "$INSTALL_NOLXD" ] && sudo dpkg-reconfigure -p medium lxd
      echo "Finished installation of juju"
      return 0