Merge branch 'master' into feature/trigger

2016-11-01 08:17:50 +01:00 · 2016-11-01 08:17:50 +01:00 · ab5d941802
commit ab5d941802
parent 7f0ad6665b c293a9b2ce
3 changed files with 8 additions and 2 deletions
--- a/scripts/cdist
+++ b/scripts/cdist
@ -165,6 +165,11 @@ def commandline():
            dest='hostfile', required=False)
    parser['config'].set_defaults(func=cdist.config.Config.commandline)

+    # Install
+    parser['install'] = parser['sub'].add_parser('install', add_help=False,
+                                                 parents=[parser['config']])
+    parser['install'].set_defaults(func=cdist.install.Install.commandline)
+
    # Shell
    parser['shell'] = parser['sub'].add_parser(
            'shell', parents=[parser['loglevel']])