Commit c09254c2 authored by Iustin Pop's avatar Iustin Pop
Browse files

Move the ssconf file prefix constant to constants.py



This way, it can be reused in the Haskell code too.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent f346a7d9
......@@ -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"
......
#
#
# 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):
......
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