diff --git a/lib/client/gnt_cluster.py b/lib/client/gnt_cluster.py
index d50d33f56f74293f1223c76b594e436f62cae5d0..5087ffd7f702e645263d41c86e3554f6c58efb44 100644
--- a/lib/client/gnt_cluster.py
+++ b/lib/client/gnt_cluster.py
@@ -1,7 +1,7 @@
 #
 #
 
-# Copyright (C) 2006, 2007, 2010, 2011 Google Inc.
+# Copyright (C) 2006, 2007, 2010, 2011, 2012 Google Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -971,7 +971,7 @@ def SetClusterParams(opts, args):
 
   diskparams = dict(opts.diskparams)
 
-  for dt_params in hvparams.values():
+  for dt_params in diskparams.values():
     utils.ForceDictType(dt_params, constants.DISK_DT_TYPES)
 
   beparams = opts.beparams