You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2013/07/22 07:37:43 UTC

[34/50] [abbrv] git commit: updated refs/heads/pvlan to ce299da

CLOUDSTACK-2543: [Multiple_IP_Ranges] Failed to create IP alias on router vm
createipAlias.sh/deleteipAlias.sh won't be copied to XenServer host.
The directory of the scripts should be ".." rather "../../.." in all the xenserver patches file.
Corrected the path to ".." because the scripts are located at scripts/vm/hypervisor/xenserver/xenserver56/patch


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

Branch: refs/heads/pvlan
Commit: aa60105a84e1260ec9687759a069a0c9cf0c46bf
Parents: d6452be
Author: Sanjeev Neelarapu <sa...@citrix.com>
Authored: Mon May 20 20:36:00 2013 +0530
Committer: Koushik Das <ko...@citrix.com>
Committed: Mon May 20 20:40:59 2013 +0530

----------------------------------------------------------------------
 scripts/vm/hypervisor/xenserver/xcposs/patch         | 2 ++
 scripts/vm/hypervisor/xenserver/xcpserver/patch      | 4 ++--
 scripts/vm/hypervisor/xenserver/xenserver56/patch    | 4 ++--
 scripts/vm/hypervisor/xenserver/xenserver56fp1/patch | 4 ++--
 scripts/vm/hypervisor/xenserver/xenserver60/patch    | 4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa60105a/scripts/vm/hypervisor/xenserver/xcposs/patch
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xcposs/patch b/scripts/vm/hypervisor/xenserver/xcposs/patch
index 6dc3baa..4d07c76 100644
--- a/scripts/vm/hypervisor/xenserver/xcposs/patch
+++ b/scripts/vm/hypervisor/xenserver/xcposs/patch
@@ -65,3 +65,5 @@ getRouterStatus.sh=../../../../network/domr/,0755,/usr/lib/xcp/bin
 bumpUpPriority.sh=../../../../network/domr/,0755,/usr/lib/xcp/bin
 getDomRVersion.sh=../../../../network/domr/,0755,/usr/lib/xcp/bin
 router_proxy.sh=../../../../network/domr/,0755,/usr/lib/xcp/bin
+createipAlias.sh=..,0755,/usr/lib/xcp/bin
+deleteipAlias.sh=..,0755,/usr/lib/xcp/bin

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa60105a/scripts/vm/hypervisor/xenserver/xcpserver/patch
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xcpserver/patch b/scripts/vm/hypervisor/xenserver/xcpserver/patch
index a275df4..7e92d5a 100644
--- a/scripts/vm/hypervisor/xenserver/xcpserver/patch
+++ b/scripts/vm/hypervisor/xenserver/xcpserver/patch
@@ -40,8 +40,8 @@ make_migratable.sh=..,0755,/opt/xensource/bin
 setup_iscsi.sh=..,0755,/opt/xensource/bin
 pingtest.sh=../../..,0755,/opt/xensource/bin
 dhcp_entry.sh=../../../../network/domr/,0755,/opt/xensource/bin
-createipAlias.sh=../../..,0755,/opt/xensource/bin
-deleteipAlias.sh=../../..,0755,/opt/xensource/bin
+createipAlias.sh=..,0755,/opt/xensource/bin
+deleteipAlias.sh=..,0755,/opt/xensource/bin
 router_proxy.sh=../../../../network/domr/,0755,/opt/xensource/bin
 vm_data.sh=../../../../network/domr/,0755,/opt/xensource/bin
 save_password_to_domr.sh=../../../../network/domr/,0755,/opt/xensource/bin

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa60105a/scripts/vm/hypervisor/xenserver/xenserver56/patch
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xenserver56/patch b/scripts/vm/hypervisor/xenserver/xenserver56/patch
index 5c4673d..8abd6b2 100644
--- a/scripts/vm/hypervisor/xenserver/xenserver56/patch
+++ b/scripts/vm/hypervisor/xenserver/xenserver56/patch
@@ -38,8 +38,8 @@ make_migratable.sh=..,0755,/opt/xensource/bin
 setup_iscsi.sh=..,0755,/opt/xensource/bin
 cloud-setup-bonding.sh=..,0755,/opt/xensource/bin
 pingtest.sh=../../..,0755,/opt/xensource/bin
-createipAlias.sh=../../..,0755,/opt/xensource/bin
-deleteipAlias.sh=../../..,0755,/opt/xensource/bin
+createipAlias.sh=..,0755,/opt/xensource/bin
+deleteipAlias.sh=..,0755,/opt/xensource/bin
 dhcp_entry.sh=../../../../network/domr/,0755,/opt/xensource/bin
 vm_data.sh=../../../../network/domr/,0755,/opt/xensource/bin
 save_password_to_domr.sh=../../../../network/domr/,0755,/opt/xensource/bin

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa60105a/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch b/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
index c7c58b9..901f6de 100644
--- a/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
+++ b/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
@@ -37,8 +37,8 @@ setupxenserver.sh=..,0755,/opt/xensource/bin
 make_migratable.sh=..,0755,/opt/xensource/bin
 setup_iscsi.sh=..,0755,/opt/xensource/bin
 pingtest.sh=../../..,0755,/opt/xensource/bin
-createipAlias.sh=../../..,0755,/opt/xensource/bin
-deleteipAlias.sh=../../..,0755,/opt/xensource/bin
+createipAlias.sh=..,0755,/opt/xensource/bin
+deleteipAlias.sh=..,0755,/opt/xensource/bin
 dhcp_entry.sh=../../../../network/domr/,0755,/opt/xensource/bin
 vm_data.sh=../../../../network/domr/,0755,/opt/xensource/bin
 save_password_to_domr.sh=../../../../network/domr/,0755,/opt/xensource/bin

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa60105a/scripts/vm/hypervisor/xenserver/xenserver60/patch
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xenserver60/patch b/scripts/vm/hypervisor/xenserver/xenserver60/patch
index 26205f2..d7da374 100644
--- a/scripts/vm/hypervisor/xenserver/xenserver60/patch
+++ b/scripts/vm/hypervisor/xenserver/xenserver60/patch
@@ -40,8 +40,8 @@ id_rsa.cloud=../../../systemvm,0600,/root/.ssh
 network_info.sh=..,0755,/opt/xensource/bin
 setupxenserver.sh=..,0755,/opt/xensource/bin
 make_migratable.sh=..,0755,/opt/xensource/bin
-createipAlias.sh=../../..,0755,/opt/xensource/bin
-deleteipAlias.sh=../../..,0755,/opt/xensource/bin
+createipAlias.sh=..,0755,/opt/xensource/bin
+deleteipAlias.sh=..,0755,/opt/xensource/bin
 setup_iscsi.sh=..,0755,/opt/xensource/bin
 pingtest.sh=../../..,0755,/opt/xensource/bin
 dhcp_entry.sh=../../../../network/domr/,0755,/opt/xensource/bin