From b85ecec646a53e9a5a9af7373cab3d72a444be6c Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Wed, 16 Feb 2011 17:16:19 -0800
Subject: [PATCH] call setIptable before launch heartbeat

---
 .../cloud/hypervisor/xen/resource/CitrixResourceBase.java  | 7 +------
 .../cloud/hypervisor/xen/resource/XenServer56Resource.java | 6 +++++-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index ceffcd41833..7179e25f07d 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -3751,7 +3751,7 @@ public abstract class CitrixResourceBase implements ServerResource {
                 String tag = it.next();
                 if (tag.startsWith("vmops-version-")) {
                     if (tag.contains(version)) {
-                        s_logger.info(logX(host, "Host " + hr.address + " is already setup."));
+                        s_logger.info(logX(host, "Host " + hr.address + " is already setup."));                       
                         return;
                     } else {
                         it.remove();
@@ -3824,11 +3824,6 @@ public abstract class CitrixResourceBase implements ServerResource {
             } finally {
                 sshConnection.close();
             }
-
-            if (!setIptables(conn)) {
-                s_logger.warn("set xenserver Iptable failed");
-            }
-
             hr.tags.add("vmops-version-" + version);
             host.setTags(conn, hr.tags);
         } catch (XenAPIException e) {
diff --git a/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java b/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
index 63f8da72946..d4a82f09b8e 100644
--- a/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/XenServer56Resource.java
@@ -583,6 +583,11 @@ public class XenServer56Resource extends CitrixResourceBase {
         } catch (Exception e) {
             throw new CloudRuntimeException("Unable to remove heartbeat tag", e);
         }
+        
+        if (!setIptables(conn)) {
+            s_logger.warn("set xenserver Iptable failed");
+            return null;
+        }
 
         String result = callHostPluginPremium(conn, "heartbeat", "host", _host.uuid, "interval", Integer
                 .toString(_heartbeatInterval));
@@ -590,7 +595,6 @@ public class XenServer56Resource extends CitrixResourceBase {
             s_logger.warn("Unable to launch the heartbeat process on " + _host.ip);
             return null;
         }
-
         return cmds;
     }