On Wed, Jun 30, 2010 at 05:15:23PM +0100, Luca Bigliardi wrote: > Signed-off-by: Luca Bigliardi <[email protected]> > --- > lib/bootstrap.py | 18 +++++++++++++++++- > 1 files changed, 17 insertions(+), 1 deletions(-) > > diff --git a/lib/bootstrap.py b/lib/bootstrap.py > index 94ad63e..1ae5cd8 100644 > --- a/lib/bootstrap.py > +++ b/lib/bootstrap.py > @@ -39,6 +39,7 @@ from ganeti import objects > from ganeti import ssconf > from ganeti import serializer > from ganeti import hypervisor > +from ganeti import bdev > > > def _InitSSHSetup(): > @@ -210,12 +211,13 @@ def _InitFileStorage(file_storage_dir): > return file_storage_dir > > > +#pylint: disable-msg=R0913 > def InitCluster(cluster_name, mac_prefix, > master_netdev, file_storage_dir, candidate_pool_size, > secondary_ip=None, vg_name=None, beparams=None, > nicparams=None, hvparams=None, enabled_hypervisors=None, > modify_etc_hosts=True, modify_ssh_setup=True, > - maintain_node_health=False, > + maintain_node_health=False, drbd_helper=None, > uid_pool=None): > """Initialise the cluster. > > @@ -279,6 +281,19 @@ def InitCluster(cluster_name, mac_prefix, > " you are not using lvm" % vgstatus, > errors.ECODE_INVAL) > > + if drbd_helper is not None: > + try: > + curr_helper = bdev.BaseDRBD.GetUsermodeHelper() > + except errors.BlockDeviceError, err: > + raise errors.OpPrereqError("Error: %s\nspecify --no-drbd-storage if" > + " you are not using drbd" % str(err), > + errors.ECODE_ENVIRON)
Mmm, I don't like formatting embedded in error codes. Maybe you can rewrite it, e.g. as: "Error while checking the drbd helper (specify --no-drbd-storage if you are not using drbd): %s". Rest LGTM. iustin
