Revision 88b92fe3

b/lib/bootstrap.py
43 43
from ganeti import netutils
44 44
from ganeti import backend
45 45

  
46
# ec_id for InitConfig's temporary reservation manager
47
_INITCONF_ECID = "initconfig-ecid"
48

  
46 49

  
47 50
def _InitSSHSetup():
48 51
  """Setup the SSH configuration for the cluster.
......
387 390
    uid_pool=uid_pool,
388 391
    ctime=now,
389 392
    mtime=now,
390
    uuid=utils.NewUUID(),
391 393
    maintain_node_health=maintain_node_health,
392 394
    drbd_usermode_helper=drbd_helper,
393 395
    default_iallocator=default_iallocator,
......
432 434
  @param cfg_file: configuration file path
433 435

  
434 436
  """
437
  uuid_generator = config.TemporaryReservationManager()
438
  cluster_config.uuid = uuid_generator.Generate([], utils.NewUUID,
439
                                                _INITCONF_ECID)
440
  master_node_config.uuid = uuid_generator.Generate([], utils.NewUUID,
441
                                                    _INITCONF_ECID)
435 442
  nodes = {
436 443
    master_node_config.name: master_node_config,
437 444
    }
438

  
445
  default_nodegroup = objects.NodeGroup(
446
    uuid=uuid_generator.Generate([], utils.NewUUID, _INITCONF_ECID),
447
    name="default",
448
    members=[master_node_config.name],
449
    )
450
  nodegroups = {
451
    default_nodegroup.uuid: default_nodegroup,
452
    }
439 453
  now = time.time()
440 454
  config_data = objects.ConfigData(version=version,
441 455
                                   cluster=cluster_config,
456
                                   nodegroups=nodegroups,
442 457
                                   nodes=nodes,
443 458
                                   instances={},
444 459
                                   serial_no=1,

Also available in: Unified diff