Revision f8af377d

b/tools/cfgupgrade
189 189
          print("NIC with network name %s found."
190 190
                " Substituting with uuid %s." % (name, uuid))
191 191
          nic["network"] = uuid
192
      try:
193
        del nic["idx"]
194
        print("Deleting deprecated idx")
195
      except KeyError:
196
        pass
192 197

  
193 198
    if "disks" not in iobj:
194 199
      raise Error("Instance '%s' doesn't have a disks entry?!" % instance)
......
203 208
        dobj["iv_name"] = expected
204 209
      if not "spindles" in dobj:
205 210
        missing_spindles = True
211
      try:
212
        del dobj["idx"]
213
        print("Deleting deprecated idx")
214
      except KeyError:
215
        pass
216

  
217
    for attr in ("dev_idxs", "hotplug_info", "hotplugs", "pci_reservations"):
218
      try:
219
        del iobj[attr]
220
        print("Deleting deprecated %s" % attr)
221
      except KeyError:
222
        pass
206 223

  
207 224
  if GetExclusiveStorageValue(config_data) and missing_spindles:
208 225
    # We cannot be sure that the instances that are missing spindles have

Also available in: Unified diff