Revision cf692cd0 lib/cmdlib.py

b/lib/cmdlib.py
2300 2300
        full_params = cluster.GetHVDefaults(hv_name, os_name=os_name)
2301 2301
        hvp_data.append(("os %s" % os_name, hv_name, full_params))
2302 2302
    # TODO: collapse identical parameter values in a single one
2303
    for instance in self.my_inst_info.values():
2303
    for instance in self.all_inst_info.values():
2304 2304
      if not instance.hvparams:
2305 2305
        continue
2306 2306
      hvp_data.append(("instance %s" % instance.name, instance.hypervisor,
......
2314 2314
        utils.UniqueSequence(filename
2315 2315
                             for files in filemap
2316 2316
                             for filename in files),
2317
      constants.NV_NODELIST: [node.name for node in node_data_list
2317
      constants.NV_NODELIST: [node.name for node in self.all_node_info.values()
2318 2318
                              if not node.offline],
2319 2319
      constants.NV_HYPERVISOR: hypervisors,
2320 2320
      constants.NV_HVPARAMS: hvp_data,
......
2363 2363

  
2364 2364
    # Gather OOB paths
2365 2365
    oob_paths = []
2366
    for node in node_data_list:
2366
    for node in self.all_node_info.values():
2367 2367
      path = _SupportsOob(self.cfg, node)
2368 2368
      if path and path not in oob_paths:
2369 2369
        oob_paths.append(path)
......
2458 2458

  
2459 2459
      if nimg.vm_capable:
2460 2460
        self._VerifyNodeLVM(node_i, nresult, vg_name)
2461
        self._VerifyNodeDrbd(node_i, nresult, self.my_inst_info, drbd_helper,
2461
        self._VerifyNodeDrbd(node_i, nresult, self.all_inst_info, drbd_helper,
2462 2462
                             all_drbd_map)
2463 2463

  
2464 2464
        self._UpdateNodeVolumes(node_i, nresult, nimg, vg_name)
......
2510 2510
        instance_groups = {}
2511 2511

  
2512 2512
        for node in instance_nodes:
2513
          instance_groups.setdefault(self.my_node_info[node].group,
2513
          instance_groups.setdefault(self.all_node_info[node].group,
2514 2514
                                     []).append(node)
2515 2515

  
2516 2516
        pretty_list = [
......
2552 2552
    self._VerifyOrphanVolumes(node_vol_should, node_image, reserved)
2553 2553

  
2554 2554
    feedback_fn("* Verifying orphan instances")
2555
    self._VerifyOrphanInstances(self.my_inst_names, node_image)
2555
    self._VerifyOrphanInstances(set(self.all_inst_info.keys()), node_image)
2556 2556

  
2557 2557
    if constants.VERIFY_NPLUSONE_MEM not in self.op.skip_checks:
2558 2558
      feedback_fn("* Verifying N+1 Memory redundancy")

Also available in: Unified diff