Commit graph

507 commits

Author SHA1 Message Date
Nico Schottelius
9955dc74c6 cleanups in bin/
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 18:43:08 +02:00
Nico Schottelius
dd176d7a64 construct cache dir path in cdist-config, not cdist-cache
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 15:40:08 +02:00
Steven Armstrong
e7ff4c37ff remove legacy commented code
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-31 11:08:10 +02:00
Steven Armstrong
61b7b68671 split explorer/manifest and gencode runcode into to 2 steps
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-30 22:46:49 +02:00
Steven Armstrong
e7f7a88357 prefix error messages with Error:
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 22:00:54 +02:00
Steven Armstrong
1cfdc6886f fail if a requested object is not defined
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 21:51:59 +02:00
Steven Armstrong
878f7d18ce move export of __cdist_out_object_dir to cdist-run-remote
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 21:49:06 +02:00
Steven Armstrong
fe159eccb2 prefix all variables with __cdist
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 21:47:05 +02:00
Steven Armstrong
2345d6509b add missing function call to __cdist_usage
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 21:20:07 +02:00
Nico Schottelius
1d05756076 release 1.5.0
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 16:47:02 +02:00
Steven Armstrong
ebbacf4873 remove unused functions
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 16:41:38 +02:00
Nico Schottelius
6be9d02e6a consistency: function {} begin on next line
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 16:28:59 +02:00
Nico Schottelius
ad7a9f82f7 __cdist_objects_created == local output
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 16:27:57 +02:00
Steven Armstrong
f2967ef9f1 remove legacy script
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 15:36:23 +02:00
Steven Armstrong
ce62775aec remove hard coded variable names; prefix all variables with __cdist_
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 15:29:56 +02:00
Steven Armstrong
32392d129a implement $__self
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 15:27:17 +02:00
Steven Armstrong
801d2be3d2 remove legacy variables
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 15:17:45 +02:00
Steven Armstrong
f187ed257a implement the big code shuffle
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-29 14:36:35 +02:00
Nico Schottelius
5306737d22 discuss todos / cleanup / make more fun for us
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 10:38:35 +02:00
Nico Schottelius
3618b225a3 make all internal variables __cdist_ prefixed
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-29 10:34:04 +02:00
Nico Schottelius
c80fa65af1 -blank line
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:42:04 +02:00
Nico Schottelius
a46c0a4372 replace CONSTANT target host by variable target host
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:38:43 +02:00
Nico Schottelius
8315ac2e25 - blank lines
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:38:08 +02:00
Nico Schottelius
8abd5ce33e - another empty line
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:37:26 +02:00
Nico Schottelius
332548ba4f more todo, less whiteline in bin/cdist-object-explorer-run
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:31:26 +02:00
Nico Schottelius
78777ba9f3 use same argv processing as elsewhere
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:30:09 +02:00
Nico Schottelius
10c96dee87 -useless emptly line in bin/cdist-deploy-to
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:26:17 +02:00
Nico Schottelius
4e68c3027b remove self explanatory comments
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:19:51 +02:00
Nico Schottelius
4ab770400a - lines + variable alignement
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:17:17 +02:00
Nico Schottelius
29b61f38ea remove unecessary empty lines (interrupts read flow)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 18:09:35 +02:00
Steven Armstrong
9381b1c233 merge current master
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 17:15:26 +02:00
Steven Armstrong
8b0b7052c6 remove commented obsolete code
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 15:28:55 +02:00
Steven Armstrong
5ce4586fd3 Merge branch 'changerunningorder' into executionorder 2011-03-28 15:27:32 +02:00
Steven Armstrong
db66d3731d merge master
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-03-28 15:27:00 +02:00
Nico Schottelius
62c4f0d086 ABORT if explorer fails, not only WARN
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-28 15:16:48 +02:00
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