cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [30/50] [abbrv] git commit: updated refs/heads/marvin_refactor to 7c439fe
Date Mon, 29 Apr 2013 13:14:08 GMT
CLOUDSTACK-2161 coping /etc/iptables/iptables-* to /etc/iptables/rules to work for old templates

In 4.2 templates iptables-persistent is looking for /etc/iptables/rules.v4 file but the old
templates 4.1 and earlier
are looking for /etc/iptables/rules.
So coping the file to both rules and rules.v4

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c65ad6b8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c65ad6b8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c65ad6b8

Branch: refs/heads/marvin_refactor
Commit: c65ad6b8e80a90a535fded7e284dce8c74f94a98
Parents: c34233d
Author: Jayapal <jayapalreddy.uradi@citrix.com>
Authored: Thu Apr 25 15:19:31 2013 +0530
Committer: Abhinandan Prateek <aprateek@apache.org>
Committed: Fri Apr 26 13:43:13 2013 +0530

----------------------------------------------------------------------
 .../debian/config/etc/init.d/cloud-early-config    |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c65ad6b8/patches/systemvm/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index 187ae25..6ffd648 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -520,6 +520,7 @@ setup_sshd(){
   local eth=$2
   [ -f /etc/ssh/sshd_config ] && sed -i -e "s/^[#]*ListenAddress.*$/ListenAddress
$ip/" /etc/ssh/sshd_config
   sed -i "/3922/s/eth./$eth/" /etc/iptables/rules.v4
+  sed -i "/3922/s/eth./$eth/" /etc/iptables/rules
 }
 
 
@@ -692,6 +693,8 @@ setup_router() {
   enable_fwding 1
   chkconfig nfs-common off
   cp /etc/iptables/iptables-router /etc/iptables/rules.v4
+#for old templates
+  cp /etc/iptables/iptables-router /etc/iptables/rules
   setup_sshd $ETH1_IP "eth1"
 }
 
@@ -764,6 +767,7 @@ EOF
   disable_rpfilter
   enable_fwding 1
   cp /etc/iptables/iptables-vpcrouter /etc/iptables/rules.v4
+  cp /etc/iptables/iptables-vpcrouter /etc/iptables/rules
   setup_sshd $ETH0_IP "eth0"
   cp /etc/vpcdnsmasq.conf /etc/dnsmasq.conf
   cp /etc/cloud-nic.rules /etc/udev/rules.d/cloud-nic.rules
@@ -790,6 +794,7 @@ setup_dhcpsrvr() {
   enable_fwding 0
   chkconfig nfs-common off
   cp /etc/iptables/iptables-router /etc/iptables/rules.v4
+  cp /etc/iptables/iptables-router /etc/iptables/rules
   if [ "$SSHONGUEST" == "true" ]
   then
     setup_sshd $ETH0_IP "eth0"
@@ -825,6 +830,7 @@ setup_secstorage() {
   echo "$public_ip $NAME" >> /etc/hosts
 
   cp /etc/iptables/iptables-secstorage /etc/iptables/rules.v4
+  cp /etc/iptables/iptables-secstorage /etc/iptables/rules
   if [ "$hyp" == "vmware" ]; then
     setup_sshd $ETH1_IP "eth1"
   else
@@ -849,6 +855,7 @@ setup_console_proxy() {
   sed -i  /gateway/d /etc/hosts
   echo "$public_ip $NAME" >> /etc/hosts
   cp /etc/iptables/iptables-consoleproxy /etc/iptables/rules.v4
+  cp /etc/iptables/iptables-consoleproxy /etc/iptables/rules
   if [ "$hyp" == "vmware" ]; then
     setup_sshd $ETH1_IP "eth1"
   else
@@ -874,6 +881,7 @@ setup_elbvm() {
   echo "$public_ip $NAME" >> /etc/hosts
 
   cp /etc/iptables/iptables-elbvm /etc/iptables/rules.v4
+  cp /etc/iptables/iptables-elbvm /etc/iptables/rules
   if [ "$SSHONGUEST" == "true" ]
   then
     setup_sshd $ETH0_IP "eth0"


Mime
View raw message