diff --git a/cdist/install.py b/cdist/install.py index bec8d24a..b88ad016 100644 --- a/cdist/install.py +++ b/cdist/install.py @@ -30,7 +30,8 @@ class Install(cdist.config.Config): In install mode, we only care about install objects. """ for cdist_object in cdist.core.CdistObject.list_objects( - self.local.object_path, self.local.type_path): + self.local.object_path, self.local.type_path, + self.local.object_marker_name): if cdist_object.cdist_type.is_install: yield cdist_object else: diff --git a/docs/src/man1/cdist.rst b/docs/src/man1/cdist.rst index c9384aaa..8c1a4e98 100644 --- a/docs/src/man1/cdist.rst +++ b/docs/src/man1/cdist.rst @@ -162,7 +162,7 @@ executed which configures/installs host. Request path recognies following formats: * :strong:`/config/.*` for config -* :strong:`/install/.*` for install +* :strong:`/install/.*` for install .. option:: -6, --ipv6 diff --git a/scripts/cdist b/scripts/cdist index 3fff6d67..271a2704 100755 --- 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']])