You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2013/11/08 09:01:12 UTC
[1/4] git commit: updated refs/heads/master to 57ba367
Updated Branches:
refs/heads/master 63b23bb34 -> 57ba367f3
check Linux bridge status before remove it (Cherry-picked from commit a33f0e7bdd3bc359e483eca36cf9faf1f2c7c521)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c2fc6e69
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c2fc6e69
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c2fc6e69
Branch: refs/heads/master
Commit: c2fc6e69b5eabcd706879f1b0df30ff19669c584
Parents: 63b23bb
Author: Wei Zhou <w....@leaseweb.com>
Authored: Thu Nov 7 11:06:42 2013 +0100
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Fri Nov 8 09:00:12 2013 +0100
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c2fc6e69/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
index 84743ec..b400fd2 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
@@ -205,7 +205,11 @@ public class BridgeVifDriver extends VifDriverBase {
private void deleteVnetBr(String brName) {
synchronized (_vnetBridgeMonitor) {
- String cmdout = Script.runSimpleBashScript("ls /sys/class/net/" + brName + "/brif | tr '\n' ' '");
+ String cmdout = Script.runSimpleBashScript("ls /sys/class/net/" + brName);
+ if (cmdout == null)
+ // Bridge does not exist
+ return;
+ cmdout = Script.runSimpleBashScript("ls /sys/class/net/" + brName + "/brif | tr '\n' ' '");
if (cmdout != null && cmdout.contains("vnet")) {
// Active VM remains on that bridge
return;
[3/4] git commit: updated refs/heads/master to 57ba367
Posted by we...@apache.org.
remove network limitation of nics on systemvms (cherry picked from commit 0227e0013ad90bb66a29e0852d9a114951b8f6fc)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/edf04a33
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/edf04a33
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/edf04a33
Branch: refs/heads/master
Commit: edf04a33c1a3b04869130b30ec0216ae658777fb
Parents: 958312d
Author: Wei Zhou <w....@leaseweb.com>
Authored: Thu Nov 7 11:07:48 2013 +0100
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Fri Nov 8 09:00:24 2013 +0100
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkModelImpl.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/edf04a33/server/src/com/cloud/network/NetworkModelImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java
index df9f651..c8733b0 100755
--- a/server/src/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/com/cloud/network/NetworkModelImpl.java
@@ -941,16 +941,21 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
// from the network offering
boolean isUserVmsDefaultNetwork = false;
boolean isDomRGuestOrPublicNetwork = false;
+ boolean isSystemVmNetwork = false;
if (vm != null) {
Nic nic = _nicDao.findByNtwkIdAndInstanceId(networkId, vmId);
if (vm.getType() == Type.User && nic != null && nic.isDefaultNic()) {
isUserVmsDefaultNetwork = true;
} else if (vm.getType() == Type.DomainRouter && ntwkOff != null && (ntwkOff.getTrafficType() == TrafficType.Public || ntwkOff.getTrafficType() == TrafficType.Guest)) {
isDomRGuestOrPublicNetwork = true;
+ } else if (vm.getType() == Type.ConsoleProxy || vm.getType() == Type.SecondaryStorageVm) {
+ isSystemVmNetwork = true;
}
}
if (isUserVmsDefaultNetwork || isDomRGuestOrPublicNetwork) {
return _configMgr.getServiceOfferingNetworkRate(vm.getServiceOfferingId(), network.getDataCenterId());
+ } else if (isSystemVmNetwork) {
+ return -1;
} else {
return _configMgr.getNetworkOfferingNetworkRate(ntwkOff.getId(), network.getDataCenterId());
}
[2/4] git commit: updated refs/heads/master to 57ba367
Posted by we...@apache.org.
CLOUDSTACK-5042: fix NPE error as BroadcastUri is NULL in shared network after upgrade from 2.2.14 (Cherry-picked from commit 09e7ab9750df27d96159bbcf3f41bafc33ac6fbe)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/958312de
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/958312de
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/958312de
Branch: refs/heads/master
Commit: 958312de4cdf1c6e79f9b1f119b91568baf7ba90
Parents: c2fc6e6
Author: Wei Zhou <w....@leaseweb.com>
Authored: Thu Nov 7 11:07:24 2013 +0100
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Fri Nov 8 09:00:15 2013 +0100
----------------------------------------------------------------------
server/src/com/cloud/network/IpAddressManagerImpl.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/958312de/server/src/com/cloud/network/IpAddressManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java b/server/src/com/cloud/network/IpAddressManagerImpl.java
index 8619ae1..2c54137 100644
--- a/server/src/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/com/cloud/network/IpAddressManagerImpl.java
@@ -1892,7 +1892,10 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
//nic.setBroadcastType(BroadcastDomainType.Vlan);
//nic.setBroadcastUri(BroadcastDomainType.Vlan.toUri(ip.getVlanTag()));
nic.setBroadcastType(network.getBroadcastDomainType());
- nic.setBroadcastUri(network.getBroadcastUri());
+ if (network.getBroadcastUri() != null)
+ nic.setBroadcastUri(network.getBroadcastUri());
+ else
+ nic.setBroadcastUri(BroadcastDomainType.Vlan.toUri(ip.getVlanTag()));
nic.setFormat(AddressFormat.Ip4);
nic.setReservationId(String.valueOf(ip.getVlanTag()));
nic.setMacAddress(ip.getMacAddress());
[4/4] git commit: updated refs/heads/master to 57ba367
Posted by we...@apache.org.
CLOUDSTACK-5042: change cloud.keystore to cloudmanagementserver.keystore and install it (cherry picked from commit de448ec4792eda5b47d79b26e9cb8ce96a2b22f4)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/57ba367f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/57ba367f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/57ba367f
Branch: refs/heads/master
Commit: 57ba367f3c985e80ea1b34267e298b481a353298
Parents: edf04a3
Author: Wei Zhou <w....@leaseweb.com>
Authored: Thu Nov 7 11:09:06 2013 +0100
Committer: Wei Zhou <w....@leaseweb.com>
Committed: Fri Nov 8 09:00:29 2013 +0100
----------------------------------------------------------------------
client/tomcatconf/cloudmanagementserver.keystore | Bin 1316 -> 0 bytes
client/tomcatconf/cloudmanagementserver.keystore.in | Bin 0 -> 1316 bytes
debian/cloudstack-management.postinst | 5 ++++-
packaging/centos63/cloud.spec | 10 +++++++++-
.../com/cloud/server/ConfigurationServerImpl.java | 2 +-
5 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/57ba367f/client/tomcatconf/cloudmanagementserver.keystore
----------------------------------------------------------------------
diff --git a/client/tomcatconf/cloudmanagementserver.keystore b/client/tomcatconf/cloudmanagementserver.keystore
deleted file mode 100644
index 3ee4d13..0000000
Binary files a/client/tomcatconf/cloudmanagementserver.keystore and /dev/null differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/57ba367f/client/tomcatconf/cloudmanagementserver.keystore.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/cloudmanagementserver.keystore.in b/client/tomcatconf/cloudmanagementserver.keystore.in
new file mode 100644
index 0000000..3ee4d13
Binary files /dev/null and b/client/tomcatconf/cloudmanagementserver.keystore.in differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/57ba367f/debian/cloudstack-management.postinst
----------------------------------------------------------------------
diff --git a/debian/cloudstack-management.postinst b/debian/cloudstack-management.postinst
index a1219cc..8d99f6a 100644
--- a/debian/cloudstack-management.postinst
+++ b/debian/cloudstack-management.postinst
@@ -35,7 +35,7 @@ if [ "$1" = configure ]; then
OLDCONFDIR="/etc/cloud/management"
NEWCONFDIR="/etc/cloudstack/management"
- CONFFILES="db.properties cloud.keystore key"
+ CONFFILES="db.properties key"
# Copy old configuration so the admin doesn't have to do that
# Only do so when we are installing for the first time
@@ -45,6 +45,9 @@ if [ "$1" = configure ]; then
cp -a $OLDCONFDIR/$FILE $NEWCONFDIR/$FILE
fi
done
+ if [ -f "$OLDCONFDIR/cloud.keystore" ]; then
+ cp -a $OLDCONFDIR/cloud.keystore $NEWCONFDIR/cloudmanagementserver.keystore
+ fi
fi
chmod 0640 /etc/cloudstack/management/db.properties
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/57ba367f/packaging/centos63/cloud.spec
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index ebe4511..cd6ff4b 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -252,7 +252,7 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/cl
rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms
for name in db.properties log4j-cloud.xml tomcat6-nonssl.conf tomcat6-ssl.conf server-ssl.xml server-nonssl.xml \
- catalina.policy catalina.properties classpath.conf tomcat-users.xml web.xml environment.properties ; do
+ catalina.policy catalina.properties classpath.conf tomcat-users.xml web.xml environment.properties cloudmanagementserver.keystore ; do
mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/$name \
${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name
done
@@ -450,6 +450,13 @@ else
echo "Unable to determine ssl settings for tomcat.conf, please run cloudstack-setup-management manually"
fi
+if [ -f "%{_sysconfdir}/cloud.rpmsave/management/cloud.keystore" ]; then
+ mv %{_sysconfdir}/%{name}/management/cloudmanagementserver.keystore %{_sysconfdir}/%{name}/management/cloudmanagementserver.keystore.rpmnew
+ cp -p %{_sysconfdir}/cloud.rpmsave/management/cloud.keystore %{_sysconfdir}/%{name}/management/cloudmanagementserver.keystore
+ # make sure we only do this on the first install of this RPM, don't want to overwrite on a reinstall
+ mv %{_sysconfdir}/cloud.rpmsave/management/cloud.keystore %{_sysconfdir}/cloud.rpmsave/management/cloud.keystore.rpmsave
+fi
+
%preun agent
/sbin/service cloudstack-agent stop || true
if [ "$1" == "0" ] ; then
@@ -539,6 +546,7 @@ fi
%config(noreplace) %{_sysconfdir}/%{name}/management/cloud-bridge.properties
%config(noreplace) %{_sysconfdir}/%{name}/management/commons-logging.properties
%config(noreplace) %{_sysconfdir}/%{name}/management/ec2-service.properties
+%config(noreplace) %{_sysconfdir}/%{name}/management/cloudmanagementserver.keystore
%attr(0755,root,root) %{_initrddir}/%{name}-management
%attr(0755,root,root) %{_bindir}/%{name}-setup-management
%attr(0755,root,root) %{_bindir}/%{name}-update-xenserver-licenses
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/57ba367f/server/src/com/cloud/server/ConfigurationServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 0676db8..8459ada 100755
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -584,7 +584,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
File confFile = PropertiesUtil.findConfigFile("db.properties");
/* This line may throw a NPE, but that's due to fail to find db.properities, meant some bugs in the other places */
String confPath = confFile.getParent();
- String keystorePath = confPath + "/cloud.keystore";
+ String keystorePath = confPath + "/cloudmanagementserver.keystore";
File keystoreFile = new File(keystorePath);
boolean dbExisted = (dbString != null && !dbString.isEmpty());