You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ja...@apache.org on 2013/12/18 07:58:03 UTC
[1/2] git commit: updated refs/heads/4.3 to dd039da
Updated Branches:
refs/heads/4.3 dc0f8ebdf -> dd039da7e
CLOUDSTACK-5507: Unable to add XenServer 5.6 host to cloudstack
Fixed "ImportError: No module named cloudstack_pluginlib" on Xenserver 5.6
Signed-off-by: Jayapal <ja...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8354f33e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8354f33e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8354f33e
Branch: refs/heads/4.3
Commit: 8354f33e33d4e6d917d563dc9f82410c1ed86704
Parents: dc0f8eb
Author: Harikrishna Patnala <ha...@citrix.com>
Authored: Tue Dec 17 13:00:04 2013 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Wed Dec 18 12:27:09 2013 +0530
----------------------------------------------------------------------
scripts/vm/hypervisor/xenserver/xenserver56/patch | 1 +
scripts/vm/hypervisor/xenserver/xenserver56fp1/patch | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8354f33e/scripts/vm/hypervisor/xenserver/xenserver56/patch
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xenserver56/patch b/scripts/vm/hypervisor/xenserver/xenserver56/patch
index 4180b6e..f12b35e 100644
--- a/scripts/vm/hypervisor/xenserver/xenserver56/patch
+++ b/scripts/vm/hypervisor/xenserver/xenserver56/patch
@@ -29,6 +29,7 @@
NFSSR.py=/opt/xensource/sm
vmops=..,0755,/etc/xapi.d/plugins
vmopsSnapshot=..,0755,/etc/xapi.d/plugins
+cloudstack_pluginlib.py=..,0755,/etc/xapi.d/plugins
hostvmstats.py=..,0755,/opt/xensource/sm
systemvm.iso=../../../../../vms,0644,/opt/xensource/packages/iso
id_rsa.cloud=../../../systemvm,0600,/root/.ssh
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8354f33e/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
----------------------------------------------------------------------
diff --git a/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch b/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
index 4a95048..493663d 100644
--- a/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
+++ b/scripts/vm/hypervisor/xenserver/xenserver56fp1/patch
@@ -29,6 +29,7 @@
NFSSR.py=/opt/xensource/sm
vmops=..,0755,/etc/xapi.d/plugins
vmopsSnapshot=..,0755,/etc/xapi.d/plugins
+cloudstack_pluginlib.py=..,0755,/etc/xapi.d/plugins
hostvmstats.py=..,0755,/opt/xensource/sm
systemvm.iso=../../../../../vms,0644,/opt/xensource/packages/iso
id_rsa.cloud=../../../systemvm,0600,/root/.ssh
[2/2] git commit: updated refs/heads/4.3 to dd039da
Posted by ja...@apache.org.
CLOUDSTACK-5505: Fixed issue in getting interface number in IpAssocVpcCommand
Regression from the below commit
commit 494ccd821d711a2957531d1c33274ed293e4d925
Author: ynojima <ma...@ynojima.net>
Date: Wed Nov 6 11:02:56 2013 -0700
Bugfix: VR has double NICs connected to Public network
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dd039da7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dd039da7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dd039da7
Branch: refs/heads/4.3
Commit: dd039da7e4567b4962d25128964998c23d32dc72
Parents: 8354f33
Author: Jayapal <ja...@apache.org>
Authored: Wed Dec 18 11:42:23 2013 +0530
Committer: Jayapal <ja...@apache.org>
Committed: Wed Dec 18 12:27:20 2013 +0530
----------------------------------------------------------------------
.../network/router/VpcVirtualNetworkApplianceManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd039da7/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index 1396e42..c9cdb1f 100644
--- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -811,7 +811,7 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
// should this be a vlan id or a broadcast uri???
String vlanTag = BroadcastDomainType.getValue(network.getBroadcastUri());
String netmask = NetUtils.getCidrNetmask(network.getCidr());
- PrivateIpAddress ip = new PrivateIpAddress(ipVO, vlanTag, network.getGateway(), netmask, guestNic.getMacAddress());
+ PrivateIpAddress ip = new PrivateIpAddress(ipVO, network.getBroadcastUri().toString(), network.getGateway(), netmask, guestNic.getMacAddress());
List<PrivateIpAddress> privateIps = new ArrayList<PrivateIpAddress>(1);
privateIps.add(ip);
@@ -957,7 +957,7 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
// or maybe conditional; in case of vlan ... in case of lswitch
String vlanTag = BroadcastDomainType.getValue(network.getBroadcastUri());
String netmask = NetUtils.getCidrNetmask(network.getCidr());
- PrivateIpAddress ip = new PrivateIpAddress(ipVO, vlanTag, network.getGateway(), netmask, privateNic.getMacAddress());
+ PrivateIpAddress ip = new PrivateIpAddress(ipVO, network.getBroadcastUri().toString(), network.getGateway(), netmask, privateNic.getMacAddress());
List<PrivateIpAddress> privateIps = new ArrayList<PrivateIpAddress>(1);
privateIps.add(ip);