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

Update cli to use the new MergeConfigMixIn.

Browse Source 
The purpose of the above MixIn is to override the options on the configuration file with the options passed from the console.
This commit is contained in:
Pedro Algarvio 2013-02-27 12:29:13 +00:00
parent 6f34684d21
commit 3734f1440e
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
saltapi/cli.py
View File

@ -3,20 +3,22 @@ CLI entry-point for salt-api
''' '''
# Import salt libs # Import salt libs
from salt.utils.parsers import ( from salt.utils.parsers import (
ConfigDirMixIn, ConfigDirMixIn,
DaemonMixIn, DaemonMixIn,
LogLevelMixIn, LogLevelMixIn,
OptionParser, MergeConfigMixIn,
OptionParserMeta, OptionParser,
PidfileMixin) OptionParserMeta,
PidfileMixin)
# Import salt-api libs # Import salt-api libs
import saltapi.client import saltapi.client
import saltapi.config import saltapi.config
import saltapi.version import saltapi.version
class SaltAPI(OptionParser, ConfigDirMixIn, LogLevelMixIn, PidfileMixin, class SaltAPI(OptionParser, ConfigDirMixIn, LogLevelMixIn, PidfileMixin,
DaemonMixIn): DaemonMixIn, MergeConfigMixIn):
''' '''
The cli parser object used to fire up the salt api system. The cli parser object used to fire up the salt api system.
''' '''