As discussed, this change should be a part of the Gluster patch series, and the logic should be different, handling constant changes and possible new disk templates better.
On Mon, Nov 11, 2013 at 6:44 PM, Santi Raffa <[email protected]> wrote: > Disk templates without params were handled separately in the same > identical way. This commit fixes this code duplication issue. > > Signed-off-by: Santi Raffa <[email protected]> > --- > lib/objects.py | 14 +++++--------- > 1 file changed, 5 insertions(+), 9 deletions(-) > > diff --git a/lib/objects.py b/lib/objects.py > index dc86478..844536d 100644 > --- a/lib/objects.py > +++ b/lib/objects.py > @@ -857,7 +857,11 @@ class Disk(ConfigObject): > > result = list() > dt_params = disk_params[disk_template] > - if disk_template == constants.DT_DRBD8: > + > + if constants.DISK_LD_DEFAULTS[disk_template] == {}: > + result.append({}) > + > + elif disk_template == constants.DT_DRBD8: > > result.append(FillDict(constants.DISK_LD_DEFAULTS[constants.DT_DRBD8], { > constants.LDP_RESYNC_RATE: dt_params[constants.DRBD_RESYNC_RATE], > constants.LDP_BARRIERS: dt_params[constants.DRBD_DISK_BARRIERS], > @@ -884,25 +888,17 @@ class Disk(ConfigObject): > constants.LDP_STRIPES: dt_params[constants.DRBD_META_STRIPES], > })) > > - elif disk_template in (constants.DT_FILE, constants.DT_SHARED_FILE): > - result.append(constants.DISK_LD_DEFAULTS[disk_template]) > - > elif disk_template == constants.DT_PLAIN: > > result.append(FillDict(constants.DISK_LD_DEFAULTS[constants.DT_PLAIN], { > constants.LDP_STRIPES: dt_params[constants.LV_STRIPES], > })) > > - elif disk_template == constants.DT_BLOCK: > - result.append(constants.DISK_LD_DEFAULTS[constants.DT_BLOCK]) > - > elif disk_template == constants.DT_RBD: > > result.append(FillDict(constants.DISK_LD_DEFAULTS[constants.DT_RBD], { > constants.LDP_POOL: dt_params[constants.RBD_POOL], > constants.LDP_ACCESS: dt_params[constants.RBD_ACCESS], > })) > > - elif disk_template == constants.DT_EXT: > - result.append(constants.DISK_LD_DEFAULTS[constants.DT_EXT]) > > return result > > -- > 1.8.4.1 > > Hrvoje Ribicic Ganeti Engineering Google Germany GmbH Dienerstr. 12, 80331, München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores Steuernummer: 48/725/00206 Umsatzsteueridentifikationsnummer: DE813741370
