Fix local client configuration loading paths

thatch45 · Mar 31, 2011 · b5de9c9 · b5de9c9
1 parent 1cf6a0b
commit b5de9c9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/salt/cli/__init__.py b/salt/cli/__init__.py
@@ -70,6 +70,13 @@ def __parse(self):
                 help='Execute a salt command query, this can be used to find'\
                     + ' previous function calls, of to look up a call that'\
                     + ' occured at a specific time.')
+        parser.add_option('-c',
+                '--config',
+                default='/etc/salt/master',
+                dest='conf_file',
+                help='The location of the salt master configuration file,'\
+                    + ' the salt master settings are required to know where'\
+                    + ' the connections are; default=/etc/salt/master')
 
         options, args = parser.parse_args()
 
@@ -80,6 +87,8 @@ def __parse(self):
         opts['pcre'] = options.pcre
         opts['list'] = options.list_
         opts['facter'] = options.facter
+        opts['conf_file'] = options.conf_file
+
         if options.query:
             opts['query'] = options.query
             if len(args) < 1:
@@ -102,7 +111,7 @@ def run(self):
         '''
         Execute the salt command line
         '''
-        local = salt.client.LocalClient()
+        local = salt.client.LocalClient(self.opts['conf_file'])
         if self.opts.has_key('query'):
             print local.find_cmd(self.opts['cmd'])
         else:

diff --git a/salt/master.py b/salt/master.py
@@ -112,7 +112,7 @@ def __init__(self, opts):
         self.key = self.__prep_key()
         self.crypticle = salt.crypt.Crypticle(self.opts['aes'])
         # Make a client
-        self.local = salt.client.LocalClient()
+        self.local = salt.client.LocalClient(self.opts['conf_file'])
 
     def __prep_key(self):
         '''
@@ -336,7 +336,8 @@ def _cluster_load(self):
             pub = os.path.join(minion_dir, host)
             minions[host] = open(pub, 'r').read()
         if self.opts['cluster_mode'] == 'full':
-            master_pem = open(os.path.join(self.opts['pki_dir'], 'master.pem')).read()
+            master_pem = open(os.path.join(self.opts['pki_dir'],
+                'master.pem')).read()
         return [minions,
                 master_conf,
                 master_pem,