LGTM, thanks
On Tue, Apr 1, 2014 at 11:02 AM, Helga Velroyen <[email protected]> wrote: > This patch fixes a little glitch in 'gnt-cluster verify'. > If LVM-based storage was disabled, it would still check > LVM-related verification results and print a confusing > error message. > > Signed-off-by: Helga Velroyen <[email protected]> > --- > lib/cmdlib/cluster.py | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/lib/cmdlib/cluster.py b/lib/cmdlib/cluster.py > index f6e44e8..80e6c3f 100644 > --- a/lib/cmdlib/cluster.py > +++ b/lib/cmdlib/cluster.py > @@ -3130,10 +3130,13 @@ class LUClusterVerifyGroup(LogicalUnit, > _VerifyErrors): > > if nimg.vm_capable: > self._UpdateVerifyNodeLVM(node_i, nresult, vg_name, nimg) > - self._VerifyNodeDrbd(node_i, nresult, self.all_inst_info, > drbd_helper, > - all_drbd_map) > + if constants.DT_DRBD8 in cluster.enabled_disk_templates: > + self._VerifyNodeDrbd(node_i, nresult, self.all_inst_info, > drbd_helper, > + all_drbd_map) > > - self._UpdateNodeVolumes(node_i, nresult, nimg, vg_name) > + if (constants.DT_PLAIN in cluster.enabled_disk_templates) or \ > + (constants.DT_DRBD8 in cluster.enabled_disk_templates): > + self._UpdateNodeVolumes(node_i, nresult, nimg, vg_name) > self._UpdateNodeInstances(node_i, nresult, nimg) > self._UpdateNodeInfo(node_i, nresult, nimg, vg_name) > self._UpdateNodeOS(node_i, nresult, nimg) > -- > 1.9.1.423.g4596e3a > >
