evilham/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
4459 commits 73 branches 156 tags 17 MiB
Commit graph

453 commits

Author SHA1 Message Date
Nico Schottelius
2b03ccd776 changes for 3.1.0 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-19 18:57:11 +01:00
Nico Schottelius
bcca8a637b Merge branch 'master' into type__rbenv 2014-03-13 10:30:48 +01:00
Nico Schottelius
d288ee1cde ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-11 15:40:44 +01:00
Nico Schottelius
19f6126a0f ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-03-03 07:42:27 +01:00
Nico Schottelius
d6b7033f2b ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-22 10:13:51 +01:00
Nico Schottelius
9c6defe17c unauthenticated problem 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-18 20:17:08 +01:00
Nico Schottelius
4ce52c5a9d -ws 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-15 11:31:39 +01:00
Nico Schottelius
549a1fc754 Merge branch 'issue_286' of https://github.com/dheule/cdist 2014-02-14 22:19:07 +01:00
Daniel Heule
478ebd190c transfert idea into the file in git tree, so we can close issue 286 2014-02-14 22:06:43 +01:00
Nico Schottelius
ff897bc904 Merge branch 'master' into 4.0-pre-not-stable 2014-02-14 20:58:19 +01:00
Nico Schottelius
ac23fa3e10 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-14 20:53:43 +01:00
Nico Schottelius
2734e5069e Merge branch '3.0' into 4.0-pre-not-stable 2014-02-14 20:52:36 +01:00
Nico Schottelius
13e8e53941 Merge branch 'master' into type__rbenv 2014-02-14 20:51:29 +01:00
Nico Schottelius
1cdcb12ebd ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-14 20:51:20 +01:00
Nico Schottelius
490bad7b26 Merge branch 'master' into type__rbenv 2014-02-14 20:13:18 +01:00
Nico Schottelius
134a4a7b34 add discussion notes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-14 12:45:34 +01:00
Nico Schottelius
d55763ad6d ++release 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-14 09:59:56 +01:00
Nico Schottelius
a765fe5c07 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-14 01:48:33 +01:00
Nico Schottelius
2afa0ad2fc ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-12 17:07:07 +01:00
Nico Schottelius
a4376b4d74 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-12 16:57:29 +01:00
Nico Schottelius
01a3f7c0b7 Merge branch 'bugfix_override_and_order' of https://github.com/dheule/cdist 2014-02-12 16:56:30 +01:00
Nico Schottelius
32eee3b8e9 Merge branch 'master' into 4.0-pre-not-stable 2014-02-12 16:47:10 +01:00
Nico Schottelius
c615a82212 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-12 16:42:39 +01:00
Daniel Heule
cfbc68aa11 bugfix if both override and order is specified 2014-02-12 10:31:46 +01:00
Nico Schottelius
e3464bef1b release 3.0.8 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-11 22:46:25 +01:00
Nico Schottelius
9ce3809eb3 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-11 22:31:30 +01:00
Nico Schottelius
3cc49460a3 Merge branch 'master' into preos 2014-02-10 21:34:54 +01:00
Nico Schottelius
219f3a99bf Merge branch 'master' into install_integration 2014-02-10 21:34:35 +01:00
Nico Schottelius
42b240f496 Merge branch 'master' into 4.0-pre-not-stable 2014-02-10 14:56:19 +01:00
Nico Schottelius
2b3aba1281 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-10 07:32:58 +01:00
Nico Schottelius
b4373b91b3 add document to describe the flow when installing 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-10 07:22:57 +01:00
Nico Schottelius
03f99a0e55 Merge branch 'preos' into 4.0-pre-not-stable 2014-02-08 00:32:39 +01:00
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
Nico Schottelius
acddd14ce1 Merge branch 'master' into preos 2014-02-08 00:31:30 +01:00
Nico Schottelius
77df0ae324 update reference 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-08 00:14:42 +01:00
Nico Schottelius
f87fc63a79 cdist 3.0.7 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-08 00:13:33 +01:00
Nico Schottelius
2fa174f6ea update link to ungleich 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-06 17:02:14 +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
Nico Schottelius
49764ae5c7 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-06 15:58:25 +01:00
Nico Schottelius
724385fcf3 update manifest document for in order execution 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-06 15:55:41 +01:00
Nico Schottelius
41266a1946 Merge branch 'feature__cdist_autodep_try2' of git://github.com/dheule/cdist 2014-02-06 15:48:45 +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
98e7b7644c release 3.0.6 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-06 11:35:45 +01:00
Nico Schottelius
c1d2ceefc2 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-06 00:10:02 +01:00
Nico Schottelius
5389d71905 Merge branch 'master' into 4.0-pre-not-stable 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	cdist/config.py
	cdist/emulator.py
	docs/changelog
 2014-02-05 23:22:04 +01:00
Nico Schottelius
2e6a827513 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-05 23:15:56 +01:00
Nico Schottelius
c663d87ba6 release 3.0.5 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-05 22:53:45 +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
Nico Schottelius
65b3f6c75a also document require variable 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-05 20:52:35 +01:00
Nico Schottelius
d1cc8a6999 document environment variables that influence cdist 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-05 20:50:59 +01:00
Nico Schottelius
2363cdda47 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-02-05 20:50:23 +01:00
Daniel Heule
1b455e810b clarify in the example that override don't touch parameter witch are not 
present in the 2nd call
 2014-02-02 20:29:41 +01:00
Nico Schottelius
ab3b151918 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-31 21:52:43 +01:00
Nico Schottelius
dc1a5dfd6d update override documentation 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-31 21:50:32 +01:00
Nico Schottelius
99dedc4933 examples are always the last section 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-31 21:48:09 +01:00
Nico Schottelius
a9dd040164 Merge branch 'feature_object_override' of git://github.com/dheule/cdist 2014-01-31 21:47:23 +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
Nico Schottelius
d5f04b26c8 ++changes(3.0.4) 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-29 23:19:18 +01:00
Nico Schottelius
52a3db04d0 Merge branch 'master' into install_integration 2014-01-29 22:31:31 +01:00
Nico Schottelius
aa3e92f07b use directory files/, not templates 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-29 21:08:22 +01:00
Nico Schottelius
e52a059adf ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-27 19:38:26 +01:00
Daniel Heule
4ef55ef13f allow object overrides with CDIST_ALLOW_OVERRIDE=true 2014-01-27 16:19:01 +01:00
Nico Schottelius
565e11b16d ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-27 14:18:56 +01:00
Nico Schottelius
78be159eb7 update reference: we also do not touch 'files' in the object 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-27 14:15:41 +01:00
Nico Schottelius
8216ec88e4 Merge branch 'master' into 4.0-pre-not-stable 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>

Conflicts:
	docs/changelog
 2014-01-24 01:20:12 +01:00
Nico Schottelius
a62e4aade3 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-22 22:07:12 +01:00
Nico Schottelius
87d72dfc1a release: 3.0.3 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-22 00:46:35 +01:00
Nico Schottelius
0a3b5d33d9 Merge branch 'master' into 4.0-pre-not-stable 2014-01-22 00:45:12 +01:00
Nico Schottelius
0e49ccbf43 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-22 00:44:56 +01:00
Nico Schottelius
cb648fce33 Merge branches 'install_integration' and 'preos' into 4.0-pre-not-stable 2014-01-21 17:17:29 +01:00
Nico Schottelius
26fcbbb4ef Merge branch 'master' into install_integration 2014-01-21 17:17:20 +01:00
Nico Schottelius
5f79efb201 Merge branch 'master' into preos 2014-01-21 16:46:22 +01:00
Nico Schottelius
520bcc29a7 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-21 16:43:02 +01:00
Nico Schottelius
d89cdbae0a Merge branch 'master' into preos 2014-01-21 16:05:03 +01:00
Nico Schottelius
ba0c56efbd Merge branch 'master' into 4.0-pre-not-stable 2014-01-21 14:05:44 +01:00
Nico Schottelius
6746ba8279 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-21 09:16:45 +01:00
Daniel Heule
64f4cff3cb Shell selection support via ENV 
CDIST_LOCAL_SHELL for local scripts
CDIST_REMOTE_SHELL for remote scripts
 2014-01-20 20:30:37 +01:00
Nico Schottelius
4bd6158260 add log from today 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-20 16:19:41 +01:00
Nico Schottelius
3ca911dbc6 integrate install and preos support 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-20 14:37:50 +01:00
Nico Schottelius
2388188fbb Merge branches 'preos' and 'install_integration' into 4.0-pre-not-stable 2014-01-20 14:28:49 +01:00
Nico Schottelius
7988b3f8b9 Merge branch 'master' into preos 2014-01-20 14:28:37 +01:00
Nico Schottelius
c16d542da4 Merge branch 'master' into install_integration 2014-01-20 14:28:29 +01:00
Nico Schottelius
f7c4437873 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-20 14:27:26 +01:00
Nico Schottelius
c790014cd5 add scaled version of the cdist logo 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-20 10:11:23 +01:00
Nico Schottelius
e463f84333 add changelog for 4.x cdist series 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-20 10:04:42 +01:00
Nico Schottelius
f3bf1b3ea1 merge preos and install 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-20 09:47:45 +01:00
Nico Schottelius
f89a720cd2 Merge branch 'master' into preos 2014-01-20 08:48:44 +01:00
Nico Schottelius
ebc84859fc Merge branch 'master' into install_integration 2014-01-19 23:30:13 +01:00
Nico Schottelius
c47abb6af7 ++changes 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-19 23:29:56 +01:00
Nico Schottelius
bf7427e937 Merge branch 'master' into install_integration 2014-01-19 22:11:45 +01:00
Nico Schottelius
f3b7fc1514 release 3.0.2 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-19 21:38:38 +01:00
Nico Schottelius
f3ab45d9ff Merge branch 'master' into install_integration 2014-01-19 19:44:40 +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
Nico Schottelius
c4140a7c7b ++changes(3.0.2) 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-18 15:57:39 +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
Nico Schottelius
f23999c8d3 ++changes(3.0.2) 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-17 10:41:23 +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
Nico Schottelius
ad09a9258e ++changes(3.0.2) 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
 2014-01-15 13:25:37 +01:00