Charmed Install Updates from v7.0

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

diff --git a/installers/charmed_uninstall.sh b/installers/charmed_uninstall.sh
index a310177..ef2b293 100755 (executable)
--- a/installers/charmed_uninstall.sh
+++ b/installers/charmed_uninstall.sh
@@ -12,27 +12,8 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
-function remove_iptables() {
-    stack=$1
-    if [ -z "$OSM_VCA_HOST" ]; then
-        OSM_VCA_HOST=`sg lxd -c "juju show-controller controller"|grep api-endpoints|awk -F\' '{print $2}'|awk -F\: '{print $1}'`
-        [ -z "$OSM_VCA_HOST" ] && FATAL "Cannot obtain juju controller IP address"
-    fi
 
-    if [ -z "$DEFAULT_IP" ]; then
-        DEFAULT_IF=`route -n |awk '$1~/^0.0.0.0/ {print $8}'`
-        [ -z "$DEFAULT_IF" ] && FATAL "Not possible to determine the interface with the default route 0.0.0.0"
-        DEFAULT_IP=`ip -o -4 a |grep ${DEFAULT_IF}|awk '{split($4,a,"/"); print a[1]}'`
-        [ -z "$DEFAULT_IP" ] && FATAL "Not possible to determine the IP address of the interface with the default route"
-    fi
 
-    if sudo iptables -t nat -C PREROUTING -p tcp -m tcp -d $DEFAULT_IP --dport 17070 -j DNAT --to-destination $OSM_VCA_HOST; then
-        sudo iptables -t nat -D PREROUTING -p tcp -m tcp -d $DEFAULT_IP --dport 17070 -j DNAT --to-destination $OSM_VCA_HOST
-        sudo netfilter-persistent save
-    fi
-}
-
-remove_iptables
 juju destroy-model osm --destroy-storage -y
 juju destroy-model test --destroy-storage -y
 sudo snap unalias osm