Remove all iptables rules that are set in base image

Change-Id: If92e0e7a6ae667b70eb7d0df5d6534a943032c42
This commit is contained in:
iberezovskiy 2014-03-05 18:27:48 +04:00
parent 14c8e57ec3
commit d62713cc0c
5 changed files with 4 additions and 7 deletions

View File

@ -117,8 +117,8 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then
export HIVE_VERSION=${HIVE_VERSION:-"0.11.0"}
ubuntu_elements_sequence="base vm ubuntu hadoop swift_hadoop oozie mysql hive"
fedora_elements_sequence="base vm fedora hadoop swift_hadoop oozie mysql hive"
centos_elements_sequence="vm rhel hadoop swift_hadoop oozie mysql hive redhat-lsb"
fedora_elements_sequence="base vm fedora hadoop swift_hadoop oozie mysql hive disable-firewall"
centos_elements_sequence="vm rhel hadoop swift_hadoop oozie mysql hive redhat-lsb disable-firewall"
# Workaround for https://bugs.launchpad.net/diskimage-builder/+bug/1204824
# https://bugs.launchpad.net/sahara/+bug/1252684

View File

@ -1,5 +1,7 @@
#!/bin/bash
install-packages which
if which systemctl; then
systemctl disable firewalld
fi

View File

@ -23,14 +23,9 @@ function firstboot_common()
sleep 1
done
chown -R $user:$user /home/$user
#TODO: configure iptables (https://bugs.launchpad.net/sahara/+bug/1195744)
iptables -F
;;
CentOS )
chown -R cloud-user:cloud-user /home/cloud-user
service iptables stop
chkconfig iptables off
;;
* )
echo "Unknown distro: $distro. Exiting."