diff --git a/lib/constants.py b/lib/constants.py index e5b10746a292f132c3147c9d823ef7499a246ae6..b76863e9bf4030420282adcad027c60d7dded1e8 100644 --- a/lib/constants.py +++ b/lib/constants.py @@ -1698,6 +1698,8 @@ RSS_DESCRIPTION = { MAX_NICS = 8 MAX_DISKS = 16 +# SSCONF file prefix +SSCONF_FILEPREFIX = "ssconf_" # SSCONF keys SS_CLUSTER_NAME = "cluster_name" SS_CLUSTER_TAGS = "cluster_tags" diff --git a/lib/ssconf.py b/lib/ssconf.py index babd148e675650a482a1b8649505b6cccf3e6873..2399d81065325a25a6524a45a082f075881f73e1 100644 --- a/lib/ssconf.py +++ b/lib/ssconf.py @@ -1,7 +1,7 @@ # # -# Copyright (C) 2006, 2007, 2008, 2010 Google Inc. +# Copyright (C) 2006, 2007, 2008, 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 @@ -273,7 +273,6 @@ class SimpleStore(object): - keys are restricted to predefined values """ - _SS_FILEPREFIX = "ssconf_" _VALID_KEYS = ( constants.SS_CLUSTER_NAME, constants.SS_CLUSTER_TAGS, @@ -314,7 +313,7 @@ class SimpleStore(object): raise errors.ProgrammerError("Invalid key requested from SSConf: '%s'" % str(key)) - filename = self._cfg_dir + "/" + self._SS_FILEPREFIX + key + filename = self._cfg_dir + "/" + constants.SSCONF_FILEPREFIX + key return filename def _ReadFile(self, key, default=None):