From: madavi <jm00553988@techmahindra.com>
Date: Wed, 20 Nov 2019 05:31:27 +0000 (+0100)
Subject: Merge "Install latest stable version of Juju"
X-Git-Tag: v7.0.0rc1~33
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=a7e5d0103241459c2aae06c53931bebed13b4cec;hp=-c;p=osm%2Fdevops.git

Merge "Install latest stable version of Juju"
---

a7e5d0103241459c2aae06c53931bebed13b4cec
diff --combined installers/full_install_osm.sh
index d6a02862,1e86fbd7..7b45761a
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@@ -631,7 -631,7 +631,7 @@@ function install_docker_compose() 
  
  function install_juju() {
      echo "Installing juju"
-     sudo snap install juju --classic --channel=2.5/stable
+     sudo snap install juju --classic
      [ -z "$INSTALL_NOLXD" ] && sudo dpkg-reconfigure -p medium lxd
      echo "Finished installation of juju"
      return 0
@@@ -646,10 -646,6 +646,10 @@@ function juju_createcontroller() 
  }
  
  function juju_createproxy() {
 +    echo -e "\nChecking required packages: iptables-persistent"
 +    dpkg -l iptables-persistent &>/dev/null || ! echo -e "    Not installed.\nInstalling iptables-persistent requires root privileges" || \
 +    sudo DEBIAN_FRONTEND=noninteractive apt-get -yq install iptables-persistent
 +
      if ! sudo iptables -t nat -C PREROUTING -p tcp -m tcp --dport 17070 -j DNAT --to-destination $OSM_VCA_HOST; then
          sudo iptables -t nat -A PREROUTING -p tcp -m tcp --dport 17070 -j DNAT --to-destination $OSM_VCA_HOST
          sudo netfilter-persistent save