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

Merge pull request #164 from s0undt3ch/issues/163

Browse Source 
Switch how configuration loading is done so log settings are not ignored. Fixes #163.
This commit is contained in:
Joseph Hall 2012-11-25 18:11:22 -08:00
commit 67df088586
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
saltcloud/utils/parsers.py
View File

@ -23,8 +23,6 @@ class CloudConfigMixIn(object):
__metaclass__ = parsers.MixInMeta
_mixin_prio_ = -1000 # First options seen
config = {'log_level': None}
def _mixin_setup(self):
group = self.config_group = optparse.OptionGroup(
self,
@ -116,15 +114,10 @@ class CloudConfigMixIn(object):
# Grab data from the 4 sources
# 1st - Master config
self.config.update(
salt.config.master_config(self.options.master_config)
)
# Done in CloudConfigMixIn.process_master_config()
# 2nd Override master config with salt-cloud config
self.config.update(config.cloud_config(self.options.cloud_config))
## Fix conf_file set on master config so that salt parsers don't fail
#self.config['conf_file'] = self.options.cloud_config
# Done in CloudConfigMixIn.process_cloud_config()
# 3rd - Override config with cli options
self.__merge_config_with_cli()
@ -137,6 +130,16 @@ class CloudConfigMixIn(object):
if self.config['log_level_logfile'] is None:
self.config.pop('log_level_logfile')
def process_master_config(self):
self.config = salt.config.master_config(
self.options.master_config
)
def process_cloud_config(self):
self.config.update(config.cloud_config(self.options.cloud_config))
# Force process_cloud_config to run AFTER process_master_config
process_cloud_config._mixin_prio_ = -999
class ExecutionOptionsMixIn(object):
__metaclass__ = parsers.MixInMeta