marcoduif/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests 1 Projects Releases Wiki Activity

Merge branch 'master' into feature/trigger

Browse source
This commit is contained in:
Darko Poljak 2016-11-01 08:17:50 +01:00
commit ab5d941802
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cdist/install.py
View file

@ -30,7 +30,8 @@ class Install(cdist.config.Config):
In install mode, we only care about install objects. In install mode, we only care about install objects.
""" """
for cdist_object in cdist.core.CdistObject.list_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: if cdist_object.cdist_type.is_install:
yield cdist_object yield cdist_object
else: else:

2
docs/src/man1/cdist.rst
View file

@ -162,7 +162,7 @@ executed which configures/installs host.
Request path recognies following formats: Request path recognies following formats:
* :strong:`/config/.*` for config * :strong:`/config/.*` for config
* :strong:`/install/.*` for install * :strong:`/install/.*` for install
.. option:: -6, --ipv6 .. option:: -6, --ipv6

5
scripts/cdist
View file

@ -165,6 +165,11 @@ def commandline():
dest='hostfile', required=False) dest='hostfile', required=False)
parser['config'].set_defaults(func=cdist.config.Config.commandline) 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 # Shell
parser['shell'] = parser['sub'].add_parser( parser['shell'] = parser['sub'].add_parser(
'shell', parents=[parser['loglevel']]) 'shell', parents=[parser['loglevel']])