Minion: Support setting lorry config file

1 files changed, 13 insertions, 3 deletions

diff --git a/lorry-controller-minion b/lorry-controller-minion
index 9eb6657..459130e 100755
--- a/lorry-controller-minion
+++ b/lorry-controller-minion
@@ -74,6 +74,11 @@ class MINION(cliapp.Application):
             default='lorry')
 
         self.settings.string(
+            ['lorry-config'],
+            'lorry configuration file to use',
+            metavar='LORRY_CFG')
+
+        self.settings.string(
             ['lorry-working-area'],
             'where will Lorry put its files?',
             metavar='DIR',
@@ -157,10 +162,15 @@ class MINION(cliapp.Application):
         os.write(fd, job_spec['text'])
         os.close(fd)
 
+
         argv = [
-            self.settings['lorry-cmd'],
-            self.temp_lorry_filename,
-            ]
+            self.settings['lorry-cmd']
+        ]
+
+        if self.settings['lorry-config']:
+            argv.extend(['--config', self.settings['lorry-config']])
+
+        argv.append(self.temp_lorry_filename)
 
         pipe = os.pipe()
         self.stdout_fd = pipe[0]