From 1cc97b7f77d29b46252bd5d48fde98b372c37a47 Mon Sep 17 00:00:00 2001 From: Iustin Pop <iustin@google.com> Date: Sun, 3 Jul 2011 00:11:35 +0200 Subject: [PATCH] hspace: also report the disk template Signed-off-by: Iustin Pop <iustin@google.com> Reviewed-by: Guido Trotter <ultrotter@google.com> --- htools/hspace.hs | 1 + man/hspace.rst | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/htools/hspace.hs b/htools/hspace.hs index 0ec82dccf..730584a54 100644 --- a/htools/hspace.hs +++ b/htools/hspace.hs @@ -224,6 +224,7 @@ main = do printKeys $ map (\(a, fn) -> ("SPEC_" ++ a, fn ispec)) specData printKeys [ ("SPEC_RQN", printf "%d" req_nodes) ] + printKeys [ ("SPEC_DISK_TEMPLATE", dtToString disk_template) ] let num_instances = length $ Container.elems il diff --git a/man/hspace.rst b/man/hspace.rst index 22514254d..e4a31e4ad 100644 --- a/man/hspace.rst +++ b/man/hspace.rst @@ -56,9 +56,9 @@ output (e.g. -p, -v) will output the additional information on stderr The following keys are available in the output of the script (all prefixed with *HTS_*): -SPEC_MEM, SPEC_DSK, SPEC_CPU, SPEC_RQN +SPEC_MEM, SPEC_DSK, SPEC_CPU, SPEC_RQN, SPEC_DISK_TEMPLATE These represent the specifications of the instance model used for - allocation (the memory, disk, cpu, requested nodes). + allocation (the memory, disk, cpu, requested nodes, disk template). CLUSTER_MEM, CLUSTER_DSK, CLUSTER_CPU, CLUSTER_NODES These represent the total memory, disk, CPU count and total nodes in -- GitLab