Fix bug 1125: iptables must be installed and configured if not present

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

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 22cb9f9..49d5fa2 100755 (executable)
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -254,7 +254,7 @@ EONG
 #Safe unattended install of iptables-persistent
 function check_install_iptables_persistent(){
     echo -e "\nChecking required packages: iptables-persistent"
-    if dpkg -l iptables-persistent &>/dev/null; then
+    if ! dpkg -l iptables-persistent &>/dev/null; then
         echo -e "    Not installed.\nInstalling iptables-persistent requires root privileges"
         echo iptables-persistent iptables-persistent/autosave_v4 boolean true | sudo debconf-set-selections
         echo iptables-persistent iptables-persistent/autosave_v6 boolean true | sudo debconf-set-selections
@@ -1165,6 +1165,10 @@ EOF
     if [ -n "$KUBERNETES" ]; then
         juju_addk8s
         track juju_addk8s
+        install_helm
+        track install_helm
+        install_k8s_storageclass
+        track install_k8s_storageclass
     fi
 
     [ -z "$DOCKER_NOBUILD" ] && generate_docker_images