From: Dominik Fleischmann Date: Fri, 29 Nov 2019 11:25:38 +0000 (+0100) Subject: Delete Iptables rule when uninstalling X-Git-Tag: v7.0.0rc1~15 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F57%2F8257%2F3;p=osm%2Fdevops.git Delete Iptables rule when uninstalling This fix is related to bug 908. https://osm.etsi.org/bugzilla/show_bug.cgi?id=908 Change-Id: I9798e5c498a27cc9a29af3a0e0e2ff27c4da127a Signed-off-by: Dominik Fleischmann --- diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index 58b930e4..979f604e 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -132,6 +132,19 @@ function remove_network() { sg docker -c "docker network rm net${stack}" } +function remove_iptables() { + stack=$1 + if [ -z "$OSM_VCA_HOST" ]; then + OSM_VCA_HOST=`sg lxd -c "juju show-controller ${stack}"|grep api-endpoints|awk -F\' '{print $2}'|awk -F\: '{print $1}'` + [ -z "$OSM_VCA_HOST" ] && FATAL "Cannot obtain juju controller IP address" + fi + + 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 -D PREROUTING -p tcp -m tcp --dport 17070 -j DNAT --to-destination $OSM_VCA_HOST + sudo netfilter-persistent save + fi +} + function remove_stack() { stack=$1 if sg docker -c "docker stack ps ${stack}" ; then @@ -202,6 +215,7 @@ EONG remove_volumes $OSM_STACK_NAME remove_network $OSM_STACK_NAME fi + remove_iptables $OSM_STACK_NAME echo "Removing $OSM_DOCKER_WORK_DIR" $WORKDIR_SUDO rm -rf $OSM_DOCKER_WORK_DIR sg lxd -c "juju destroy-controller --destroy-all-models --yes $OSM_STACK_NAME"