valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #20271 from s0undt3ch/2014.7

Browse Source 
Don't try to import non configurable syspath variables
This commit is contained in:
Thomas S Hatch 2015-01-31 03:20:55 -07:00
commit f84249e9e5
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
salt/syspaths.py
View File

@ -27,6 +27,12 @@ if 'SETUP_DIRNAME' in globals():
else: else:
THIS_FILE = __file__ THIS_FILE = __file__
# These variables are always relative to salt's install directory and are not
# configurable
INSTALL_DIR = os.path.dirname(os.path.realpath(THIS_FILE))
CLOUD_DIR = os.path.join(INSTALL_DIR, 'cloud')
BOOTSTRAP = os.path.join(CLOUD_DIR, 'deploy', 'bootstrap-salt.sh')
try: try:
# Let's try loading the system paths from the generated module at # Let's try loading the system paths from the generated module at
# installation time. # installation time.
@ -40,22 +46,19 @@ try:
BASE_PILLAR_ROOTS_DIR, BASE_PILLAR_ROOTS_DIR,
BASE_MASTER_ROOTS_DIR, BASE_MASTER_ROOTS_DIR,
LOGS_DIR, LOGS_DIR,
PIDFILE_DIR, PIDFILE_DIR
CLOUD_DIR,
INSTALL_DIR,
BOOTSTRAP,
) )
except ImportError: except ImportError:
# The installation time was not generated, let's define the default values # The installation time was not generated, let's define the default values
__platform = sys.platform.lower() __PLATFORM = sys.platform.lower()
if __platform.startswith('win'): if __PLATFORM.startswith('win'):
ROOT_DIR = r'c:\salt' or '/' ROOT_DIR = r'c:\salt'
CONFIG_DIR = os.path.join(ROOT_DIR, 'conf') CONFIG_DIR = os.path.join(ROOT_DIR, 'conf')
else: else:
ROOT_DIR = '/' ROOT_DIR = '/'
if 'freebsd' in __platform: if 'freebsd' in __PLATFORM:
CONFIG_DIR = os.path.join(ROOT_DIR, 'usr', 'local', 'etc', 'salt') CONFIG_DIR = os.path.join(ROOT_DIR, 'usr', 'local', 'etc', 'salt')
elif 'netbsd' in __platform: elif 'netbsd' in __PLATFORM:
CONFIG_DIR = os.path.join(ROOT_DIR, 'usr', 'pkg', 'etc', 'salt') CONFIG_DIR = os.path.join(ROOT_DIR, 'usr', 'pkg', 'etc', 'salt')
else: else:
CONFIG_DIR = os.path.join(ROOT_DIR, 'etc', 'salt') CONFIG_DIR = os.path.join(ROOT_DIR, 'etc', 'salt')
@ -67,6 +70,3 @@ except ImportError:
BASE_MASTER_ROOTS_DIR = os.path.join(SRV_ROOT_DIR, 'salt-master') BASE_MASTER_ROOTS_DIR = os.path.join(SRV_ROOT_DIR, 'salt-master')
LOGS_DIR = os.path.join(ROOT_DIR, 'var', 'log', 'salt') LOGS_DIR = os.path.join(ROOT_DIR, 'var', 'log', 'salt')
PIDFILE_DIR = os.path.join(ROOT_DIR, 'var', 'run') PIDFILE_DIR = os.path.join(ROOT_DIR, 'var', 'run')
INSTALL_DIR = os.path.dirname(os.path.realpath(THIS_FILE))
CLOUD_DIR = os.path.join(INSTALL_DIR, 'cloud')
BOOTSTRAP = os.path.join(CLOUD_DIR, 'deploy', 'bootstrap-salt.sh')