Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: eucalyptus/eucalyptus
...
head fork: eucalyptus/eucalyptus
Checking mergeability… Don't worry, you can still create the pull request.
  • 7 commits
  • 4 files changed
  • 0 commit comments
  • 3 contributors
View
5 .gitignore
@@ -26,8 +26,10 @@ clc/modules/authentication/conf/
clc/modules/bootstrap/eucalyptus-cloud
clc/modules/bootstrap/src/main/native/arguments.ggo
clc/modules/bootstrap/src/main/native/eucalyptus-cloud
+clc/modules/bootstrap/src/main/resources/version.properties
clc/modules/*/build
clc/modules/msgs/src/main/resources/msgs-binding.xml
+clc/modules/postgresql/src/main/resources/postgresql-binaries.properties
clc/modules/storage-controller/include/**
clc/modules/storage-controller/lib
clc/modules/storage-san
@@ -59,3 +61,6 @@ clc/eucadmin/eucadmin/__init__.py
storage/euca-blobs
storage/test_blobstore
storage/test_vbr
+node/test
+node/test_hooks
+node/test_nc
View
9 INSTALL
@@ -42,6 +42,15 @@ sudo which jpackage-utils java lvm2 velocity drbd83 drbd83-kmod drbd-utils drbd
dejavu-serif-fonts bridge-utils iptables vtun device-mapper coreutils e2fsprogs file parted util-linux rsync \
PyGreSQL libcurl4 curl apache2 httpd libvirt tgt scsi-target-utils vconfig wget kvm dhcp-server
+Package-name & availability notes for CentOS 6.2 (and possibly earlier?):
+
+- drbd-utils was replaced by drbd83-utils.
+- libcurl4 was replaced by libcurl.
+- apache2 was replaced by httpd.
+- dhcp-server was replaced by dhcp.
+- tgt was replaced by scsi-target-utils.
+- bitstream-vera-fonts is no longer available.
+
Download and save the following file https://github.com/eucalyptus/eucalyptus-rpmspec/blob/master/euca-WSDL2C.sh
to /opt/euca-WSDL2C.sh
View
11 clc/modules/core/conf/upgrade/upgrade_30_31.groovy
@@ -122,6 +122,7 @@ import com.eucalyptus.auth.Accounts;
import com.eucalyptus.auth.DatabaseAuthUtils;
import com.eucalyptus.auth.DatabaseAccountProxy;
import com.eucalyptus.auth.DatabaseGroupProxy;
+import com.eucalyptus.auth.DatabaseUserProxy;
// Enums
import com.eucalyptus.auth.principal.User.RegistrationStatus;
@@ -344,6 +345,7 @@ class upgrade_30_31 extends AbstractUpgradeScript {
user = convertRowToObject(userSetterMap, rowResult, user);
initMetaClass(user, UserEntity.class);
user.setRegistrationStatus(RegistrationStatus.valueOf(rowResult.auth_user_reg_stat));
+
GroupEntity userGroup = DatabaseAuthUtils.getUniqueGroup(db, DatabaseAuthUtils.getUserGroupName( rowResult.auth_user_name ), acct.getName( ) );
user = db.recast( UserEntity.class ).merge( user );
userGroup = db.recast( GroupEntity.class ).merge( userGroup );
@@ -382,6 +384,15 @@ class upgrade_30_31 extends AbstractUpgradeScript {
}
db.commit();
+ def userDelegate = new DatabaseUserProxy(user);
+ initMetaClass(userDelegate, userDelegate.class);
+ Map<String, String> info = new HashMap<String, String>( );
+ authConn.rows("""select * from auth_user_info_map
+ where userentity_id=?""", rowResult.id).each { infoRow ->
+ info.put(infoRow.auth_user_info_key, infoRow.auth_user_info_value);
+ }
+ userDelegate.setInfo(info)
+
db = EntityWrapper.get(CertificateEntity.class);
authConn.rows("""select c.* from auth_cert c
join auth_user u on (c.auth_certificate_owning_user=u.id)
View
8 clc/modules/storage-controller/src/main/java/com/eucalyptus/storage/OverlayManager.java
@@ -967,6 +967,10 @@ public void exportVolume(LVMVolumeInfo lvmVolumeInfo) throws EucalyptusCloudExce
if(pid > 0) {
//enable logical volumes
String absoluteLVName = lvmRootDirectory + PATH_SEPARATOR + aoeVolumeInfo.getVgName() + PATH_SEPARATOR + aoeVolumeInfo.getLvName();
+ if(!logicalVolumeExists(absoluteLVName)) {
+ LOG.error("Backing volume not found: " + absoluteLVName);
+ throw new EucalyptusCloudException("Logical volume not found: " + absoluteLVName);
+ }
try {
enableLogicalVolume(absoluteLVName);
} catch(EucalyptusCloudException ex) {
@@ -1015,6 +1019,10 @@ public void exportVolume(LVMVolumeInfo lvmVolumeInfo) throws EucalyptusCloudExce
if(lvmVolumeInfo instanceof ISCSIVolumeInfo) {
ISCSIVolumeInfo iscsiVolumeInfo = (ISCSIVolumeInfo) lvmVolumeInfo;
String absoluteLVName = lvmRootDirectory + PATH_SEPARATOR + iscsiVolumeInfo.getVgName() + PATH_SEPARATOR + iscsiVolumeInfo.getLvName();
+ if(!logicalVolumeExists(absoluteLVName)) {
+ LOG.error("Backing volume not found: " + absoluteLVName);
+ throw new EucalyptusCloudException("Logical volume not found: " + absoluteLVName);
+ }
try {
enableLogicalVolume(absoluteLVName);
} catch(EucalyptusCloudException ex) {

No commit comments for this range

Something went wrong with that request. Please try again.