Revision 5fcdc80d lib/cmdlib.py
b/lib/cmdlib.py | ||
---|---|---|
539 | 539 |
ss.SetKey(ss.SS_MASTER_NODE, hostname['hostname_full']) |
540 | 540 |
ss.SetKey(ss.SS_MASTER_IP, clustername['ip']) |
541 | 541 |
ss.SetKey(ss.SS_MASTER_NETDEV, self.op.master_netdev) |
542 |
ss.SetKey(ss.SS_CLUSTER_NAME, clustername['hostname']) |
|
542 | 543 |
|
543 | 544 |
# set up the inter-node password and certificate |
544 | 545 |
_InitGanetiServerSetup(ss) |
... | ... | |
568 | 569 |
# init of cluster config file |
569 | 570 |
cfgw = config.ConfigWriter() |
570 | 571 |
cfgw.InitConfig(hostname['hostname'], hostname['ip'], self.secondary_ip, |
571 |
clustername['hostname'], sshkey, self.op.mac_prefix,
|
|
572 |
sshkey, self.op.mac_prefix, |
|
572 | 573 |
self.op.vg_name, self.op.def_bridge) |
573 | 574 |
|
574 | 575 |
|
... | ... | |
1481 | 1482 |
instances = [self.cfg.GetInstanceInfo(name) |
1482 | 1483 |
for name in self.cfg.GetInstanceList()] |
1483 | 1484 |
result = { |
1484 |
"name": self.cfg.GetClusterName(),
|
|
1485 |
"name": self.sstore.GetClusterName(),
|
|
1485 | 1486 |
"software_version": constants.RELEASE_VERSION, |
1486 | 1487 |
"protocol_version": constants.PROTOCOL_VERSION, |
1487 | 1488 |
"config_version": constants.CONFIG_VERSION, |
Also available in: Unified diff