saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Various clean-ups, fixes and improvements to SPM directory references

Browse source 
in the base paths used in syspaths.py.
This commit is contained in:
Thayne Harbaugh 2018-05-04 17:41:57 -06:00
parent 6147f08df7
commit a66802c75a
5 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/man/salt.7
View file

@ -4263,7 +4263,7 @@ INSTALL_DIR = *location of source code*
CONFIG_DIR = ROOT_DIR + \(aq/etc/salt\(aq CONFIG_DIR = ROOT_DIR + \(aq/etc/salt\(aq
CACHE_DIR = ROOT_DIR + \(aq/var/cache/salt\(aq CACHE_DIR = ROOT_DIR + \(aq/var/cache/salt\(aq
SOCK_DIR = ROOT_DIR + \(aq/var/run/salt\(aq SOCK_DIR = ROOT_DIR + \(aq/var/run/salt\(aq
SRV_ROOT_DIR= ROOT_DIR + \(aq/srv\(aq SRV_ROOT_DIR = ROOT_DIR + \(aq/srv\(aq
BASE_FILE_ROOTS_DIR = ROOT_DIR + \(aq/srv/salt\(aq BASE_FILE_ROOTS_DIR = ROOT_DIR + \(aq/srv/salt\(aq
BASE_PILLAR_ROOTS_DIR = ROOT_DIR + \(aq/srv/pillar\(aq BASE_PILLAR_ROOTS_DIR = ROOT_DIR + \(aq/srv/pillar\(aq
BASE_MASTER_ROOTS_DIR = ROOT_DIR + \(aq/srv/salt\-master\(aq BASE_MASTER_ROOTS_DIR = ROOT_DIR + \(aq/srv/salt\-master\(aq

7
pkg/smartos/esky/_syspaths.py
View file

@ -22,6 +22,7 @@ BASE_THORIUM_ROOTS_DIR = os.path.join(SRV_ROOT_DIR, 'thorium')
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')
SPM_FORMULA_PATH = os.path.join(ROOT_DIR, 'spm', 'salt') SPM_PARENT_PATH = os.path.join(ROOT_DIR, 'spm')
SPM_PILLAR_PATH = os.path.join(ROOT_DIR, 'spm', 'pillar') SPM_FORMULA_PATH = os.path.join(SPM_PARENT_PATH, 'salt')
SPM_REACTOR_PATH = os.path.join(ROOT_DIR, 'spm', 'reactor') SPM_PILLAR_PATH = os.path.join(SPM_PARENT_PATH, 'pillar')
SPM_REACTOR_PATH = os.path.join(SPM_PARENT_PATH, 'reactor')

8
salt/config/__init__.py
View file

@ -1915,15 +1915,15 @@ DEFAULT_API_OPTS = {
DEFAULT_SPM_OPTS = { DEFAULT_SPM_OPTS = {
# ----- Salt master settings overridden by SPM ---------------------> # ----- Salt master settings overridden by SPM --------------------->
'spm_conf_file': os.path.join(salt.syspaths.CONFIG_DIR, 'spm'), 'spm_conf_file': os.path.join(salt.syspaths.CONFIG_DIR, 'spm'),
'formula_path': '/srv/spm/salt', 'formula_path': salt.syspaths.SPM_FORMULA_PATH,
'pillar_path': '/srv/spm/pillar', 'pillar_path': salt.syspaths.SPM_PILLAR_PATH,
'reactor_path': '/srv/spm/reactor', 'reactor_path': salt.syspaths.SPM_REACTOR_PATH,
'spm_logfile': os.path.join(salt.syspaths.LOGS_DIR, 'spm'), 'spm_logfile': os.path.join(salt.syspaths.LOGS_DIR, 'spm'),
'spm_default_include': 'spm.d/*.conf', 'spm_default_include': 'spm.d/*.conf',
# spm_repos_config also includes a .d/ directory # spm_repos_config also includes a .d/ directory
'spm_repos_config': '/etc/salt/spm.repos', 'spm_repos_config': '/etc/salt/spm.repos',
'spm_cache_dir': os.path.join(salt.syspaths.CACHE_DIR, 'spm'), 'spm_cache_dir': os.path.join(salt.syspaths.CACHE_DIR, 'spm'),
'spm_build_dir': '/srv/spm_build', 'spm_build_dir': os.path.join(salt.syspaths.SRV_ROOT_DIR, 'spm_build'),
'spm_build_exclude': ['CVS', '.hg', '.git', '.svn'], 'spm_build_exclude': ['CVS', '.hg', '.git', '.svn'],
'spm_db': os.path.join(salt.syspaths.CACHE_DIR, 'spm', 'packages.db'), 'spm_db': os.path.join(salt.syspaths.CACHE_DIR, 'spm', 'packages.db'),
'cache': 'localfs', 'cache': 'localfs',

15
salt/syspaths.py
View file

@ -36,8 +36,8 @@ except ImportError:
'SRV_ROOT_DIR', 'BASE_FILE_ROOTS_DIR', 'HOME_DIR', 'SRV_ROOT_DIR', 'BASE_FILE_ROOTS_DIR', 'HOME_DIR',
'BASE_PILLAR_ROOTS_DIR', 'BASE_THORIUM_ROOTS_DIR', 'BASE_PILLAR_ROOTS_DIR', 'BASE_THORIUM_ROOTS_DIR',
'BASE_MASTER_ROOTS_DIR', 'LOGS_DIR', 'PIDFILE_DIR', 'BASE_MASTER_ROOTS_DIR', 'LOGS_DIR', 'PIDFILE_DIR',
'SPM_FORMULA_PATH', 'SPM_PILLAR_PATH', 'SPM_REACTOR_PATH', 'SPM_PARENT_PATH', 'SPM_FORMULA_PATH',
'SHARE_DIR'): 'SPM_PILLAR_PATH', 'SPM_REACTOR_PATH', 'SHARE_DIR'):
setattr(__generated_syspaths, key, None) setattr(__generated_syspaths, key, None)
@ -124,17 +124,21 @@ PIDFILE_DIR = __generated_syspaths.PIDFILE_DIR
if PIDFILE_DIR is None: if PIDFILE_DIR is None:
PIDFILE_DIR = os.path.join(ROOT_DIR, 'var', 'run') PIDFILE_DIR = os.path.join(ROOT_DIR, 'var', 'run')
SPM_PARENT_PATH = __generated_syspaths.SPM_PARENT_PATH
if SPM_PARENT_PATH is None:
SPM_PARENT_PATH = os.path.join(SRV_ROOT_DIR, 'spm')
SPM_FORMULA_PATH = __generated_syspaths.SPM_FORMULA_PATH SPM_FORMULA_PATH = __generated_syspaths.SPM_FORMULA_PATH
if SPM_FORMULA_PATH is None: if SPM_FORMULA_PATH is None:
SPM_FORMULA_PATH = os.path.join(SRV_ROOT_DIR, 'spm', 'salt') SPM_FORMULA_PATH = os.path.join(SPM_PARENT_PATH, 'salt')
SPM_PILLAR_PATH = __generated_syspaths.SPM_PILLAR_PATH SPM_PILLAR_PATH = __generated_syspaths.SPM_PILLAR_PATH
if SPM_PILLAR_PATH is None: if SPM_PILLAR_PATH is None:
SPM_PILLAR_PATH = os.path.join(SRV_ROOT_DIR, 'spm', 'pillar') SPM_PILLAR_PATH = os.path.join(SPM_PARENT_PATH, 'pillar')
SPM_REACTOR_PATH = __generated_syspaths.SPM_REACTOR_PATH SPM_REACTOR_PATH = __generated_syspaths.SPM_REACTOR_PATH
if SPM_REACTOR_PATH is None: if SPM_REACTOR_PATH is None:
SPM_REACTOR_PATH = os.path.join(SRV_ROOT_DIR, 'spm', 'reactor') SPM_REACTOR_PATH = os.path.join(SPM_PARENT_PATH, 'reactor')
HOME_DIR = __generated_syspaths.HOME_DIR HOME_DIR = __generated_syspaths.HOME_DIR
if HOME_DIR is None: if HOME_DIR is None:
@ -157,6 +161,7 @@ __all__ = [
'INSTALL_DIR', 'INSTALL_DIR',
'CLOUD_DIR', 'CLOUD_DIR',
'BOOTSTRAP', 'BOOTSTRAP',
'SPM_PARENT_PATH',
'SPM_FORMULA_PATH', 'SPM_FORMULA_PATH',
'SPM_PILLAR_PATH', 'SPM_PILLAR_PATH',
'SPM_REACTOR_PATH' 'SPM_REACTOR_PATH'

3
setup.py
View file

@ -229,6 +229,7 @@ class GenerateSaltSyspaths(Command):
base_thorium_roots_dir=self.distribution.salt_base_thorium_roots_dir, base_thorium_roots_dir=self.distribution.salt_base_thorium_roots_dir,
logs_dir=self.distribution.salt_logs_dir, logs_dir=self.distribution.salt_logs_dir,
pidfile_dir=self.distribution.salt_pidfile_dir, pidfile_dir=self.distribution.salt_pidfile_dir,
spm_parent_path=self.distribution.salt_spm_parent_dir,
spm_formula_path=self.distribution.salt_spm_formula_dir, spm_formula_path=self.distribution.salt_spm_formula_dir,
spm_pillar_path=self.distribution.salt_spm_pillar_dir, spm_pillar_path=self.distribution.salt_spm_pillar_dir,
spm_reactor_path=self.distribution.salt_spm_reactor_dir, spm_reactor_path=self.distribution.salt_spm_reactor_dir,
@ -650,6 +651,7 @@ BASE_MASTER_ROOTS_DIR = {base_master_roots_dir!r}
BASE_THORIUM_ROOTS_DIR = {base_thorium_roots_dir!r} BASE_THORIUM_ROOTS_DIR = {base_thorium_roots_dir!r}
LOGS_DIR = {logs_dir!r} LOGS_DIR = {logs_dir!r}
PIDFILE_DIR = {pidfile_dir!r} PIDFILE_DIR = {pidfile_dir!r}
SPM_PARENT_PATH = {spm_parent_path!r}
SPM_FORMULA_PATH = {spm_formula_path!r} SPM_FORMULA_PATH = {spm_formula_path!r}
SPM_PILLAR_PATH = {spm_pillar_path!r} SPM_PILLAR_PATH = {spm_pillar_path!r}
SPM_REACTOR_PATH = {spm_reactor_path!r} SPM_REACTOR_PATH = {spm_reactor_path!r}
@ -818,6 +820,7 @@ class SaltDistribution(distutils.dist.Distribution):
self.salt_base_master_roots_dir = None self.salt_base_master_roots_dir = None
self.salt_logs_dir = None self.salt_logs_dir = None
self.salt_pidfile_dir = None self.salt_pidfile_dir = None
self.salt_spm_parent_dir = None
self.salt_spm_formula_dir = None self.salt_spm_formula_dir = None
self.salt_spm_pillar_dir = None self.salt_spm_pillar_dir = None
self.salt_spm_reactor_dir = None self.salt_spm_reactor_dir = None