projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update iptables during osm installation only if LXD is installed
[osm/devops.git]
/
installers
/
full_install_osm.sh
diff --git
a/installers/full_install_osm.sh
b/installers/full_install_osm.sh
index
a0007df
..
21a654d
100755
(executable)
--- 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
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-1
4.0-four
teen/README2.txt &> /dev/null
+ wget -q -O- https://osm-download.etsi.org/ftp/osm-1
5.0-fif
teen/README2.txt &> /dev/null
track end
sudo find /etc/osm
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
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
# Installation starts here
# Get README and create OSM_TRACK_INSTALLATION_ID
-wget -q -O- https://osm-download.etsi.org/ftp/osm-1
4.0-four
teen/README.txt &> /dev/null
+wget -q -O- https://osm-download.etsi.org/ftp/osm-1
5.0-fif
teen/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
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"
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-1
4.0-four
teen/README2.txt &> /dev/null
+ wget -q -O- https://osm-download.etsi.org/ftp/osm-1
5.0-fif
teen/README2.txt &> /dev/null
echo -e "\nDONE"
exit 0
fi
echo -e "\nDONE"
exit 0
fi