Permalink
Browse files

sync parent

  • Loading branch information...
2 parents e4c4b26 + 0440deb commit 956dfbd10339a1a9f13264fc8494af83184783f7 @grze grze committed Jan 9, 2012
Showing with 6 additions and 4 deletions.
  1. +6 −4 clc/modules/core/conf/upgrade/upgrade_20_30.groovy
@@ -591,10 +591,12 @@ class upgrade_20_30 extends AbstractUpgradeScript {
if (vol.cluster == "default") {
vol.cluster = System.getProperty("euca.storage.name");
}
- if (vol.cluster == null && vol_meta != null) {
- vol.cluster = vol_meta.sc_name;
- } else {
- throw new RuntimeException("Cannot determine SC for volume " + vol.displayname);
+ if (vol.cluster == null) {
+ if (vol_meta != null) {
+ vol.cluster = vol_meta.sc_name;
+ } else {
+ throw new RuntimeException("Cannot determine SC for volume " + vol.displayname);
+ }
}
// Second "vol.cluster" is partition name
Volume v = new Volume( ufn, vol.displayname, vol.size, vol.cluster + '_sc', vol.cluster, vol.parentsnapshot );

0 comments on commit 956dfbd

Please sign in to comment.