Change iptables rule to allow docker and LXD can share the same host network.

[osm/devops.git] / installers / full_install_osm.sh

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 8b7f1d8..3160eb4 100755 (executable)
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -823,6 +823,9 @@ function install_osm() {
     add_local_k8scluster
     track final_ops add_local_k8scluster_ok
 
+    echo -e "Fixup firewall so docker and LXD can share the host."
+    sudo iptables -I DOCKER-USER -j ACCEPT
+
     wget -q -O- https://osm-download.etsi.org/ftp/osm-13.0-thirteen/README2.txt &> /dev/null
     track end
     sudo find /etc/osm
@@ -1223,6 +1226,7 @@ fi
 
 # Charmed installation
 if [ -n "$CHARMED" ]; then
+    sudo snap install jq || FATAL "Could not install jq (snap package). Make sure that snap works"
     export OSM_TRACK_INSTALLATION_ID="$(date +%s)-$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 16)"
     track start release $RELEASE none none docker_tag $OSM_DOCKER_TAG none none installation_type $OSM_INSTALLATION_TYPE none none
     ${OSM_DEVOPS}/installers/charmed_install.sh --tag $OSM_DOCKER_TAG "$@" || \