Commit d06e7b3b authored by Thomas Thrainer's avatar Thomas Thrainer

Adapt VCluster script to current situation

vcluster-setup is adapted to the current Ganeti command line arguments.
Also, a bug for diskless instances in qa_instance is fixed.
Signed-off-by: default avatarThomas Thrainer <thomasth@google.com>
Reviewed-by: default avatarMichele Tartara <mtartara@google.com>
parent 9b0e86e2
...@@ -280,7 +280,7 @@ def TestInstanceAddFile(nodes): ...@@ -280,7 +280,7 @@ def TestInstanceAddFile(nodes):
def TestInstanceAddDiskless(nodes): def TestInstanceAddDiskless(nodes):
"""gnt-instance add -t diskless""" """gnt-instance add -t diskless"""
assert len(nodes) == 1 assert len(nodes) == 1
if constants.DT_FILE in qa_config.GetEnabledDiskTemplates(): if constants.DT_DISKLESS in qa_config.GetEnabledDiskTemplates():
return CreateInstanceByDiskTemplateOneNode(nodes, constants.DT_DISKLESS) return CreateInstanceByDiskTemplateOneNode(nodes, constants.DT_DISKLESS)
......
...@@ -290,12 +290,10 @@ EOF ...@@ -290,12 +290,10 @@ EOF
Initialize cluster: Initialize cluster:
cd $rootdir && node1/cmd gnt-cluster init --no-etc-hosts \\ cd $rootdir && node1/cmd gnt-cluster init --no-etc-hosts \\
--no-ssh-init --no-lvm-storage --no-drbd-storage $cluster_name --no-ssh-init --master-netdev=lo \\
--enabled-disk-templates=diskless --enabled-hypervisors=fake \\
Change cluster settings: --ipolicy-bounds-specs=min:disk-size=0,cpu-count=1,disk-count=0,memory-size=1,nic-count=0,spindle-use=0/max:disk-size=1048576,cpu-count=8,disk-count=16,memory-size=32768,nic-count=8,spindle-use=12 \\
cd $rootdir && node1/cmd gnt-cluster modify \\ $cluster_name
--enabled-hypervisors=fake --specs-nic-count=min=0 \\
--specs-disk-size=min=0 --specs-disk-count=min=0
Add node: Add node:
cd $rootdir && node1/cmd gnt-node add --no-ssh-key-check node2 cd $rootdir && node1/cmd gnt-node add --no-ssh-key-check node2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment