X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Ffull_install_osm.sh;h=21a654d224047c22f0d02653a8a7db68d2fa9886;hb=refs%2Fchanges%2F55%2F14155%2F1;hp=a0007df9702e0aa6562e4b75331f8f7333c4226d;hpb=cdc1b001045b6d784db6485c2c3c1e951a197ca3;p=osm%2Fdevops.git diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index a0007df9..21a654d2 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -544,9 +544,12 @@ function install_osm() { add_local_k8scluster track final_ops add_local_k8scluster_ok - arrange_docker_default_network_policy + # if lxd is requested, iptables firewall is updated to work with both docker and LXD + if [ -n "$INSTALL_LXD" ]; then + arrange_docker_default_network_policy + fi - wget -q -O- https://osm-download.etsi.org/ftp/osm-14.0-fourteen/README2.txt &> /dev/null + wget -q -O- https://osm-download.etsi.org/ftp/osm-15.0-fifteen/README2.txt &> /dev/null track end sudo find /etc/osm [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function @@ -950,7 +953,7 @@ fi # Installation starts here # Get README and create OSM_TRACK_INSTALLATION_ID -wget -q -O- https://osm-download.etsi.org/ftp/osm-14.0-fourteen/README.txt &> /dev/null +wget -q -O- https://osm-download.etsi.org/ftp/osm-15.0-fifteen/README.txt &> /dev/null export OSM_TRACK_INSTALLATION_ID="$(date +%s)-$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 16)" # Get OS info to be tracked @@ -966,7 +969,7 @@ if [ -n "$CHARMED" ]; then sudo snap install jq || FATAL "Could not install jq (snap package). Make sure that snap works" ${OSM_DEVOPS}/installers/charmed_install.sh --tag $OSM_DOCKER_TAG "$@" || \ FATAL_TRACK charmed_install "charmed_install.sh failed" - wget -q -O- https://osm-download.etsi.org/ftp/osm-14.0-fourteen/README2.txt &> /dev/null + wget -q -O- https://osm-download.etsi.org/ftp/osm-15.0-fifteen/README2.txt &> /dev/null echo -e "\nDONE" exit 0 fi