fancsali/cdist-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
4224 commits 91 branches 177 tags 18 MiB
Commit graph

42 commits

Author SHA1 Message Date
Nico Schottelius
79973d1582 Merge branch 'master' into install_integration 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/config.py
	cdist/emulator.py
 2014-02-08 00:32:28 +01:00
Daniel Heule
60c53e213c testcases emulator.OverrideTestCase, with some minor bugfixes to make 
test work as expected ...
 2014-02-07 14:24:12 +01:00
Nico Schottelius
1be3ea4362 Merge branch 'origin/feature_object_override' of git://github.com/dheule/cdist 2014-02-06 16:32:29 +01:00
Daniel Heule
52e2017d8f CDIST_ALLOW_OVERRIDE -> CDIST_OVERRIDE as requested by nico 2014-02-06 16:03:07 +01:00
Daniel Heule
51afca5336 Implement lastest suggestions from nico, rename ENV Variable to 
CDIST_ORDER_DEPENDENCY
 2014-02-06 15:26:17 +01:00
Daniel Heule
2b5929c881 Merge branch 'master' of https://github.com/telmich/cdist into feature__cdist_autodep_try2 
Conflicts:
	docs/man/man7/cdist-manifest.text
 2014-02-06 15:10:34 +01:00
Nico Schottelius
34f2f7f038 setting up CDIST_ALLOW_OVERRIDE to any value is ok - do not depend on true/yes/ja 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-05 21:09:24 +01:00
Daniel Heule
5fbac8d0ba forgot the : after the else ... 2014-01-31 17:59:56 +01:00
Daniel Heule
197fabf40a added some ideas from asteven and a bit more description about the order 
in the manpage
 2014-01-31 17:56:55 +01:00
Daniel Heule
4ef55ef13f allow object overrides with CDIST_ALLOW_OVERRIDE=true 2014-01-27 16:19:01 +01:00
Nico Schottelius
300af0b1cf Merge branch 'master' into install_integration 2014-01-19 23:28:52 +01:00
Nico Schottelius
ac0c88fe9f remove some old typos and omit type details that follow anyway 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-19 23:28:45 +01:00
Nico Schottelius
5858ebda53 Merge branch 'master' into install_integration 2014-01-19 23:22:53 +01:00
Nico Schottelius
ce73cef457 explain that a requirement caused the error, otherwise you search until you die 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-19 23:22:48 +01:00
Daniel Heule
61aec12ba1 Try2 to make cdist honor the manifest order, 
this implementation has some more lines of code,
but no collision with the require variable.
 2014-01-18 19:23:21 +01:00
Daniel Heule
824381e6ca new special value require="CDIST_HONOR_MANIFEST_ORDER" 
which tells cdist to execute types in the manifest order
 2014-01-17 23:35:02 +01:00
Steven Armstrong
54815e2b29 implement cdist install 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2014-01-15 13:43:23 +01:00
Steven Armstrong
08762330e1 default to None, not empty list 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2013-12-21 21:59:47 +01:00
Nico Schottelius
fcbb27a648 Merge remote-tracking branch 'steven/issue/240' 2013-12-20 21:24:08 +01:00
Steven Armstrong
39f65d2ef7 leave conversion of list to underlying fsproperty 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2013-12-20 11:17:43 +01:00
Steven Armstrong
8b0eb5766a bugfix: handle non-existent default 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2013-12-20 10:56:46 +01:00
Steven Armstrong
67f61eb7ec make default values for optional_multiple parameters work 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2013-12-19 23:33:43 +01:00
Steven Armstrong
fc40a40ae0 implement configurable default values for parameters 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2013-09-04 22:11:42 +02:00
Nico Schottelius
73338c330b record the type name, if there is no such type 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2013-09-02 11:30:22 +02:00
Nico Schottelius
93f5ace932 clenaup logging in emulator, cleanup emulator in main script 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2013-09-02 10:49:11 +02:00
Steven Armstrong
3de9b869ac there is no such thing as cdist install in master 
remove all traces of it to prevent the ongoing merge issues when using the real thing

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2013-08-29 21:56:53 +02:00
Nico Schottelius
e6feee14fb Merge branch 'enhance_cache' 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/test/code/__init__.py
	cdist/test/config_install/__init__.py
	cdist/test/explorer/__init__.py
 2013-08-28 15:43:03 +02:00
Nico Schottelius
136ddc05b5 context based changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2013-08-28 15:39:17 +02:00
Nico Schottelius
866645679a throw a better exception when environment variables are missing 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2013-08-19 13:34:29 +02:00
Nico Schottelius
2f5de23ae9 out_path -> base_path 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2013-08-19 12:03:25 +02:00
Steven Armstrong
7205cd5ecf remove that crappy old singleton object_id thingy 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2013-07-10 16:31:58 +02:00
Nico Schottelius
3d73cd2fd3 better debugging for wrong type, fix emulator tests, fixes #176 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2013-05-27 16:36:20 +02:00
Nico Schottelius
2fe647a1f7 Revert "implement before/after to declare dependencies and deprecate require" 
Comment from asteven:
    Some problems showed up while updating the docs and tests.
    You should revert the merge for now.

This reverts commit 84770b9ef2.
 2012-11-19 15:17:46 +01:00
Steven Armstrong
84770b9ef2 implement before/after to declare dependencies and deprecate require 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>

--whitespace

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2012-11-19 12:29:49 +01:00
Steven Armstrong
6d430524f1 binary all the way, fixes issue #138 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2012-11-19 12:04:07 +01:00
Steven Armstrong
6c685e61d5 fixes #126 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
 2012-11-16 15:27:32 +01:00
Nico Schottelius
2fca87eda8 ++comment 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-15 09:34:19 +01:00
Nico Schottelius
a498330bd3 remove _read_stdin and open stdin file in non-binary mode 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-15 09:32:44 +01:00
Nico Schottelius
45d5e4719a read from stdin using read, not buffer.read() to be compatible with other IO streams 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 10:49:11 +01:00
Nico Schottelius
a32d3abd33 allow to pass in environment into emulator 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 10:25:47 +01:00
Nico Schottelius
7b51e22922 allow to read stdin from different handle than sys.stdin in emulator 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-11-07 09:58:47 +01:00
Nico Schottelius
c9f728e073 lib/cdist => cdist (pypi) 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
 2012-10-25 17:21:58 +02:00
Renamed from lib/cdist/emulator.py (Browse further)