Commit graph

472 commits

Author SHA1 Message Date
Nico Schottelius
02a2d39ebf Merge branch 'master' into changerunningorder
Conflicts:
	bin/cdist-deploy-to

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 15:02:12 +02:00
Steven Armstrong
4ee5d74c9f implement dependency handling at the object level
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 14:55:58 +02:00
Steven Armstrong
cd1a1347c9 merge from changerunningorder
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 13:03:17 +02:00
Steven Armstrong
1c51d32cdc add missing variable __cdist_type
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 12:45:16 +02:00
Steven Armstrong
0f2193c5e3 concentrate on iteration in cdist-object-run-all; move all execution code into new executable bin/cdist-object-run
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 12:44:03 +02:00
Steven Armstrong
b5ab490a23 add more half backed code for new object-run ideas
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 10:02:13 +02:00
Steven Armstrong
4687d32771 add half backed code for new object-run ideas
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 10:00:22 +02:00
Nico Schottelius
d21cfa66a0 +indent
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-27 22:58:42 +02:00
Nico Schottelius
0a14aa080c prepare version change
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-26 23:04:06 +01:00
Steven Armstrong
bdf3e4b86e prefix all variables with __cdist_
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 22:09:19 +01:00
Steven Armstrong
4e2d063911 cleanup: remove unused variables
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 01:53:03 +01:00
Steven Armstrong
2c71018699 migrate to new workflow
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 01:52:15 +01:00
Steven Armstrong
0dab5b5f7e extract code to transfer objects into its own executable
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 01:48:44 +01:00
Steven Armstrong
4c6f115a43 extract code to execute gencode-generated scripts into its own executable
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 01:48:19 +01:00
Steven Armstrong
31842564d3 extract code to run gencode scripts into its own executable
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 01:47:51 +01:00
Steven Armstrong
e8d656556c /__cdist_remote_out_object_base_dir/__cdist_remote_out_object_dir/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 01:46:53 +01:00
Steven Armstrong
14ece853df trust nico when he says: SSH DESTROYS WHILE READ LOOP
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 01:46:02 +01:00
Steven Armstrong
31a0b6c3d0 fixed inconsistencies between local and remote variable naming
- /__cdist_remote_out_object_base_dir/__cdist_remote_out_object_dir/
- __cdist_remote_object_dir += __cdist_name_dot_cdist

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 01:43:55 +01:00
Steven Armstrong
b740a4b934 use new workflow
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 00:26:12 +01:00
Steven Armstrong
f7d20c002c introduce new executable to process objects
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 00:25:46 +01:00
Steven Armstrong
92005e2567 extract code to run an objects explorers into its own executable
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 00:24:35 +01:00
Steven Armstrong
086e47a636 extract code to transfer type explorers into its own executable
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-26 00:23:59 +01:00
Nico Schottelius
a9ce26f968 integrate cdist-cache
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-25 23:35:11 +01:00
Nico Schottelius
8f88ed2691 template for cdist-cache
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-25 23:17:35 +01:00
Steven Armstrong
c7ebbb4125 Merge remote branch 'nico/master' into changerunningorder 2011-03-25 23:08:50 +01:00
Nico Schottelius
3356564c77 upgrade to 1.4.1
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-25 22:24:02 +01:00
Nico Schottelius
17c6a650ff change workflow proposal
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-24 15:06:56 +01:00
Nico Schottelius
b20a50899a only diff parameters ?
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-24 10:35:29 +01:00
Nico Schottelius
4d2e03b966 always add source, even if everything went successful...
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-24 10:28:50 +01:00
Nico Schottelius
914ec3104e only append source in final tree, otherwise we always conflict
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-24 10:27:05 +01:00
Nico Schottelius
762c0b4935 BUGFIX: marker reset got lost during migration to cdist-type-emulator
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-24 10:24:51 +01:00
Nico Schottelius
79eec9bd23 make PATH setting independent of further code
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-24 10:17:43 +01:00
Nico Schottelius
7a294bf41d always setup __cdist_out_object_dir, which needs to be done anyway
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-24 10:13:52 +01:00
Nico Schottelius
b44734e70a local != remote
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-24 00:27:40 +01:00
Nico Schottelius
1e66bc4380 exchange new and object dir (good idea, steven)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 23:54:13 +01:00
Nico Schottelius
44ecd1f056 i'm tired, doing stuff that's already in the lines
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 17:27:27 +01:00
Nico Schottelius
a48e5ca8a1 +"
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 17:25:42 +01:00
Nico Schottelius
f375b5cb91 submit $__cdist_out_object_dir to cdist-code-run on target host
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 17:24:48 +01:00
Nico Schottelius
5e5334dee1 prepare release 1.4.0
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 17:24:21 +01:00
Nico Schottelius
c527e1a9c4 cleanup and make cdist-deploy-to run all stages again
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 16:48:36 +01:00
Nico Schottelius
a40974e286 check for existence and executable in manifest-run-all, because it's correct for manifest-run to fail if something is broken as it's used for init
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 16:45:00 +01:00
Nico Schottelius
65763a1b4d search for .cdist not source
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 16:39:06 +01:00
Nico Schottelius
1dacf779e6 HUGE cleanup of cdist-manifest-run-all
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 16:33:16 +01:00
Nico Schottelius
d7819b1922 do not use output dir in cdist-manifest-run-init
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 13:46:24 +01:00
Nico Schottelius
2d00e9d869 remove obsolete output from cdist-manifest-run
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 13:45:38 +01:00
Nico Schottelius
9ba61ac044 remove debug
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 13:41:56 +01:00
Nico Schottelius
d7b765e498 base_dir not dir_base
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 13:38:14 +01:00
Nico Schottelius
1756608720 in theory finish new algorithm to allow same objects
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 13:33:26 +01:00
Nico Schottelius
92860706b2 import merge code from cdist-manifest-run-all into cdist-type-emulator
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 12:20:09 +01:00
Nico Schottelius
2ef17f9bf2 begin merge section in cdist-type-emulator
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 12:15:00 +01:00
Nico Schottelius
34b5e44091 re-include parameter check
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 12:12:03 +01:00
Nico Schottelius
6e5ed1c8e8 re-include requirement recording
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:56:19 +01:00
Nico Schottelius
d8f7ebc73f move .dotfiles to .cdist/dotfiles (without dot)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:45:50 +01:00
Nico Schottelius
fa0a3af2a0 correctly record parameter, remove sed (not required)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:44:33 +01:00
Nico Schottelius
b46850cd12 begin to reintegrate parameter recording
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:39:17 +01:00
Nico Schottelius
a6702cc804 do not setup variables in cdist-config
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:32:22 +01:00
Nico Schottelius
69453feaa5 add __cdist_object_source_add
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:30:22 +01:00
Nico Schottelius
ab02adf01a abort after manifest-run-init to verify new methods
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:27:38 +01:00
Nico Schottelius
6f67911a0b sort object area in cdist-config
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:19:05 +01:00
Nico Schottelius
359e252ef7 begin to sort cdist-config by alphabet
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:12:39 +01:00
Nico Schottelius
25bf9e4185 Merge branch 'dotcdistapproach' into allowredefobject 2011-03-23 11:05:09 +01:00
Nico Schottelius
117232ce9d begin rewrite of cdist-type-emulator
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 11:05:02 +01:00
Nico Schottelius
19e6ea9c80 begin restructure, use name __cdist_object_self for type/object_id combination
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 10:47:13 +01:00
Nico Schottelius
0a028785c3 remove check whether object already exists
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-23 10:39:45 +01:00
Nico Schottelius
0c593f5c5b -created in text
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-22 16:48:02 +01:00
Nico Schottelius
e921986e32 remove double slash in __cdist_object in bin/cdist-type-emulator
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-22 08:57:19 +01:00
Nico Schottelius
8a76143e33 shrink cdist env and make it usable for . ./bin/cdist-env (in sh)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-22 08:29:59 +01:00
Nico Schottelius
7f3e22239f add dot-cdist to cdist-config
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-21 16:18:04 +01:00
Nico Schottelius
b41c1f7649 upgrade to 1.3.2
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-21 14:11:24 +01:00
Nico Schottelius
30c2b017d4 also name source of object when running type manifests
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-21 12:24:42 +01:00
Nico Schottelius
c0e2113643 update files for 1.3.1
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-21 08:59:04 +01:00
Nico Schottelius
6f02112aeb check for correct entry on move, not parameter ;-)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-21 08:46:54 +01:00
Nico Schottelius
0f2eeda838 include move of requirements and make move a loop
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-21 08:35:25 +01:00
Nico Schottelius
0d39da6a2b output dependencies to the user
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-21 08:31:32 +01:00
Nico Schottelius
be3080b247 __cdist_exit_err, not __exit_err
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-20 22:42:00 +01:00
Nico Schottelius
69fc63df1e export __target_user to non-core
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-20 02:44:31 +01:00
Nico Schottelius
2830e2e894 -very verbose debug
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-20 02:12:35 +01:00
Nico Schottelius
6800bbff10 call new name in requirement block
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-20 02:01:23 +01:00
Nico Schottelius
c7ccedd463 DO NOT DO WHILE READ LOOP WITH SSH
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-20 02:01:02 +01:00
Nico Schottelius
0d4f2a6c4b use __cdist_abs_mydir instead of which
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-20 00:31:34 +01:00
Nico Schottelius
6f480810f3 Update to 1.3.0
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-20 00:02:44 +01:00
Nico Schottelius
20e4e73bcd fixup cdist-code-run-all and remove obsolete code
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 23:17:40 +01:00
Nico Schottelius
418c3db23e remove almost obsolete bin/cdist-remote-code-run-all
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 23:15:55 +01:00
Nico Schottelius
1099c55c9a args==3
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 23:14:58 +01:00
Nico Schottelius
8b43913366 include local+remote run in bin/cdist-code-run-all
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 23:14:48 +01:00
Nico Schottelius
1785f5acd0 add local/remote code run capability
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 23:12:49 +01:00
Nico Schottelius
6f79f01206 cdist-remote-code-run is now also locally used: name it cdist-code-run
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 23:01:35 +01:00
Nico Schottelius
4368e00c57 save generated code in its own file
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 22:33:18 +01:00
Nico Schottelius
c086e7fcc1 adjust argument usage in bin/cdist-object-gencode
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 22:26:00 +01:00
Nico Schottelius
c5590cb648 extend cdist-object-gencode* to include remote/local extension
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 22:19:44 +01:00
Nico Schottelius
1af34c74b8 begin to differentiate local and remote object code generation
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 22:15:54 +01:00
Nico Schottelius
88e20abddb remove obsolete call to $@ in bin/cdist-remote-explorer-run
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 15:11:03 +01:00
Nico Schottelius
8d4d5a5c15 switch to cdist 1.2.0
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 03:05:22 +01:00
Nico Schottelius
7525e82ce4 clearify what to move
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 02:52:42 +01:00
Nico Schottelius
3d0cdfb7c3 move to correct top dir, not to itself
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 02:26:52 +01:00
Nico Schottelius
25664d26e9 +new
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 02:24:22 +01:00
Nico Schottelius
30a3514dfe create top level hierarchy on mv and move to object to one dir higher
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 02:23:09 +01:00
Nico Schottelius
5985fafe86 move whole object
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-19 02:17:17 +01:00
Nico Schottelius
68adb9453a make the user aware of the copy process (waiting and nothing happens stinks)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-18 10:40:31 +01:00
Nico Schottelius
35a6eefc00 __global is not where it seems to be :-)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-18 10:35:53 +01:00