Revision 75cf411a

b/lib/bootstrap.py
452 452
    }
453 453
  default_nodegroup = objects.NodeGroup(
454 454
    uuid=uuid_generator.Generate([], utils.NewUUID, _INITCONF_ECID),
455
    name="default",
455
    name=constants.INITIAL_NODE_GROUP_NAME,
456 456
    members=[master_node_config.name],
457 457
    )
458 458
  nodegroups = {
b/lib/config.py
1486 1486
        item.uuid = self._GenerateUniqueID(_UPGRADE_CONFIG_JID)
1487 1487
        modified = True
1488 1488
    if not self._config_data.nodegroups:
1489
      default_nodegroup = objects.NodeGroup(name="default", members=[])
1489
      default_nodegroup_name = constants.INITIAL_NODE_GROUP_NAME
1490
      default_nodegroup = objects.NodeGroup(name=default_nodegroup_name,
1491
                                            members=[])
1490 1492
      self._UnlockedAddNodeGroup(default_nodegroup, _UPGRADE_CONFIG_JID, True)
1491 1493
      modified = True
1492 1494
    for node in self._config_data.nodes.values():
b/lib/constants.py
1195 1195

  
1196 1196
# Name or path of the pgrep command
1197 1197
PGREP = "pgrep"
1198

  
1199
# Name of the node group that gets created at cluster init or upgrade
1200
INITIAL_NODE_GROUP_NAME = "default"
b/qa/qa_group.py
19 19
# 02110-1301, USA.
20 20

  
21 21

  
22
from ganeti import constants
23

  
22 24
import qa_config
23 25
from qa_utils import AssertCommand
24 26

  
......
27 29
  """gnt-group add/remove/rename"""
28 30
  groups = qa_config.get("groups", {})
29 31

  
30
  existing_group_with_nodes = groups.get("group-with-nodes", "default")
32
  existing_group_with_nodes = groups.get("group-with-nodes",
33
                                         constants.INITIAL_NODE_GROUP_NAME)
31 34
  group1, group2, group3 = groups.get("inexistent-groups",
32 35
                                      ["group1", "group2", "group3"])[:3]
33 36

  
b/qa/qa_rapi.py
174 174

  
175 175
  def _VerifyGroups(data):
176 176
    default_group = {
177
      "name": "default",
178
      "uri": "/2/groups/default",
177
      "name": constants.INITIAL_NODE_GROUP_NAME,
178
      "uri": "/2/groups/" + constants.INITIAL_NODE_GROUP_NAME,
179 179
      }
180 180
    AssertIn(default_group, data)
181 181

  

Also available in: Unified diff