Commit graph

220 commits

Author SHA1 Message Date
Steven Armstrong
c56d17d674 relative paths
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 15:07:57 +02:00
Nico Schottelius
7169d6ac42 more s/_dir/_path/g
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 15:05:52 +02:00
Nico Schottelius
e1f0d60e8b restructure to _path and do not make context dependent on env
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 15:03:26 +02:00
Steven Armstrong
aafdd62698 Merge remote-tracking branch 'telmich/master' 2011-10-07 13:53:08 +02:00
Steven Armstrong
1992c9a175 --legacy code
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 13:52:55 +02:00
Nico Schottelius
fa1a4263e0 setup __cdist_base_dir
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 13:51:00 +02:00
Nico Schottelius
1b484e2d87 setup __cdist_base_dir
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 13:50:37 +02:00
Steven Armstrong
f39418a7b5 implement remote_code_remote :-(
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 13:50:17 +02:00
Nico Schottelius
ed347ffb8a fix init_deploy()
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 13:49:14 +02:00
Nico Schottelius
fc6ae54889 os.path not os
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 13:48:10 +02:00
Nico Schottelius
e03ebcd5c1 require conf_dir to find manifest_dir to find manifest
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 13:46:30 +02:00
Nico Schottelius
2b0a337584 fix base_dir passing
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 13:45:19 +02:00
Nico Schottelius
1138d8b439 remote_remote_code_remote_remote
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 13:44:07 +02:00
Nico Schottelius
ca5361afc1 remote cdist.path, use base_dir
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 13:36:51 +02:00
Nico Schottelius
f121934769 cleanup object_run() finally
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 13:34:22 +02:00
Steven Armstrong
4db02516e7 consistent naming
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 13:16:14 +02:00
Steven Armstrong
d9f86e26d9 consistent naming
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 13:15:52 +02:00
Steven Armstrong
6e011dc289 implement explorer_out_dir
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 13:15:11 +02:00
Nico Schottelius
484b947eca Merge remote-tracking branch 'steven/master' 2011-10-07 13:14:58 +02:00
Nico Schottelius
af5a99dc9f update object_run() for new interface
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 13:14:47 +02:00
Steven Armstrong
3ef9798098 implement code, code_remote
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 13:06:56 +02:00
Nico Schottelius
e89ca8cfc2 Merge remote-tracking branch 'steven/master' 2011-10-07 13:04:30 +02:00
Steven Armstrong
4f33e5222d Type: implement gencode, gencode_remote
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 13:04:00 +02:00
Steven Armstrong
cdccd9c0af Merge remote-tracking branch 'telmich/master' 2011-10-07 12:59:40 +02:00
Steven Armstrong
34f2999e14 Type: implement manifest_path
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 12:59:29 +02:00
Nico Schottelius
00550edfcb finish run_manifest()
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 12:58:35 +02:00
Nico Schottelius
4a98b9af55 finish run_type_manifest
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 12:56:36 +02:00
Steven Armstrong
1668620b5b Merge remote-tracking branch 'telmich/master'
Conflicts:
	doc/dev/todo/steven

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 12:52:07 +02:00
Steven Armstrong
9473a3a19e Type: implement explorer_dir, remote_explorer_dir
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 12:49:30 +02:00
Nico Schottelius
480c1bbb35 cleanup run_type_explorer()
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 12:43:17 +02:00
Steven Armstrong
3012afeb31 Merge remote-tracking branch 'telmich/master' 2011-10-07 12:32:48 +02:00
Nico Schottelius
b936fea3e5 link to emulator in config_install and remove it from emulator
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 12:10:57 +02:00
Nico Schottelius
8a4b8e9b66 cleanup run_global_explorers()
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 12:04:38 +02:00
Nico Schottelius
b568a5886c retrieve explorers from explorer class and allow zero explorers
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 11:56:16 +02:00
Steven Armstrong
feeb7159e8 Merge remote-tracking branch 'telmich/master' 2011-10-07 11:55:12 +02:00
Nico Schottelius
73fa0e1ab7 path becomes context (+1 happy developer)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 11:51:21 +02:00
Nico Schottelius
9540d529d6 also allow to overwrite remote_base_dir
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 09:53:24 +02:00
Nico Schottelius
4b306e45f9 more ideas for globalexplorer
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 09:53:09 +02:00
Nico Schottelius
359e5156e2 +globalexplorer start
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 09:52:37 +02:00
Nico Schottelius
886c1d32ac DOT_CDIST -> cdist
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 09:48:43 +02:00
Nico Schottelius
08975c4d2f path -> config_install
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 09:47:29 +02:00
Nico Schottelius
0b63919cdd path -> copy
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 09:46:48 +02:00
Nico Schottelius
06f438f824 move stuff from path to object, remove if already existent
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 09:46:06 +02:00
Nico Schottelius
ee69971465 make temp_dir unecessary / only implementation detail
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 09:38:52 +02:00
Nico Schottelius
e26f612012 move file_to_list to cdist
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 09:29:22 +02:00
Nico Schottelius
cf97fd9837 remove type_explorer information from path
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 09:27:46 +02:00
Nico Schottelius
1810462989 move stuff over from path to object to be fixed
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 09:05:42 +02:00
Nico Schottelius
2b1c4df8d9 have explorers been transferred? (type)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-07 09:01:47 +02:00
Steven Armstrong
7bbecb2586 implement descriptor protocol for FileList and DirectoryDict
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 00:48:06 +02:00
Steven Armstrong
3873aefcf5 cleanup, add sort method
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-07 00:46:59 +02:00
Nico Schottelius
4beeecd48e Merge remote-tracking branch 'steven/oo-restructure' 2011-10-06 23:13:00 +02:00
Steven Armstrong
b4fc05ba09 Merge remote-tracking branch 'telmich/master' into oo-restructure 2011-10-06 22:32:03 +02:00
Nico Schottelius
6f58b18c8c remove legacy code, fail until type supports us
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 20:52:34 +02:00
Nico Schottelius
35a7757e1a rewrite path to include calls to non-existent methods in type (fix needed, sar :-)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 20:51:31 +02:00
Nico Schottelius
b891818b9c remove obsolete get_type_from_object() and use Object.type
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 20:42:31 +02:00
Nico Schottelius
c0d6d4d530 use name, not object
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 20:37:55 +02:00
Nico Schottelius
354e15015a use full.path.to.cdist.core.Type(), Steven ;-)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 20:34:36 +02:00
Nico Schottelius
6bd6443721 fix out dir for object
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 20:32:59 +02:00
Nico Schottelius
9b5b94577f add debug
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 20:32:47 +02:00
Nico Schottelius
be1d4afd58 add log to object
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 20:27:07 +02:00
Nico Schottelius
579bd45c87 cleanup more stuff in config_install
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 20:24:40 +02:00
Nico Schottelius
13d47f3cf4 remove datetime from config to wrong position
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 20:20:35 +02:00
Nico Schottelius
609efcbfd1 Remove datetime from config_install, break code and make it more beautiful
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 20:14:34 +02:00
Nico Schottelius
1db4cd48d2 -typo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 20:11:23 +02:00
Nico Schottelius
14082f5c00 string, not tuple in exception
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 20:05:24 +02:00
Nico Schottelius
a87e6f22b5 use new cdist.Error exception
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 19:59:07 +02:00
Nico Schottelius
d07a191867 add logger to config
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 19:54:41 +02:00
Nico Schottelius
ae9eba80a9 use require, not __require in emulator
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 19:50:45 +02:00
Nico Schottelius
ccb2ffcae6 remove toplevel object/type
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 19:47:55 +02:00
Nico Schottelius
8305f07aab stage prepare uses new object interface
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 19:43:07 +02:00
Nico Schottelius
344bfb0603 was the object prepared/ran?
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 19:40:19 +02:00
Nico Schottelius
5c9694215c setup '__cdist_out_dir' in path for use in Object
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 19:26:58 +02:00
Nico Schottelius
2157cef2a6 make cdist.MissingEnvironmentVariableError print the key and not fail :-)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 19:22:08 +02:00
Nico Schottelius
df5de24b72 begin use of cdist.core.Object.list_objects()
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 18:26:55 +02:00
Steven Armstrong
c0854ebb2e remove unused constant
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-06 17:47:08 +02:00
Nico Schottelius
bfba1938ca Merge remote-tracking branch 'steven/oo-restructure' 2011-10-06 17:37:14 +02:00
Steven Armstrong
3a1cea6887 file system backed properties
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-06 17:16:12 +02:00
Steven Armstrong
12dc0d2bdd cleanup and file system backed properties
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-06 17:15:45 +02:00
Nico Schottelius
1da7436fcb Merge branch 'install'
Conflicts:
	lib/cdist/config.py

Some problems left.

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 17:06:56 +02:00
Nico Schottelius
60b5f8783c revert changes from upcoming install branch
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 17:02:37 +02:00
Nico Schottelius
50edf2863a Merge remote-tracking branch 'steven/oo-restructure' 2011-10-06 17:00:52 +02:00
Nico Schottelius
220611604b +:
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 17:00:09 +02:00
Nico Schottelius
efe8dbfa85 Merge remote-tracking branch 'steven/oo-restructure'
Conflicts:
	lib/cdist/config.py
	lib/cdist/path.py

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 16:57:48 +02:00
Nico Schottelius
1c8a143397 commit previously missed change
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 16:52:56 +02:00
Nico Schottelius
54fb9e6c3f Merge branch 'master' into install
Conflicts:
	lib/cdist/config.py
	lib/cdist/path.py

Merged changes from config.py to config_install.py

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 16:52:20 +02:00
Nico Schottelius
8b561fd63c fixup correct split/insert of os.environ() for target_host and args
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 16:30:06 +02:00
Nico Schottelius
26278b1e32 expose target host from config
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 16:28:21 +02:00
Nico Schottelius
919f67184a do not reference scp anymore
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 15:49:08 +02:00
Nico Schottelius
5a7e4b2f32 quiet ssh/scp
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 15:48:44 +02:00
Steven Armstrong
0d9906b0b8 --typo, missing colon
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-06 15:18:06 +02:00
Nico Schottelius
59bee14101 begin to eliminate remote_user/prefix from path
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 14:02:37 +02:00
Nico Schottelius
df630e1fdf user remote_prefix=True now
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 13:40:46 +02:00
Nico Schottelius
eea6a38f33 cat only locally :-)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 13:39:08 +02:00
Nico Schottelius
278c379e07 use os.environ['__remote_exec'] in exec*
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 13:37:12 +02:00
Nico Schottelius
ecc4fc10d7 setup __remote_exec and __remote_copy variables
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-06 13:34:45 +02:00
Steven Armstrong
a15972f20d +docstring
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-06 13:21:48 +02:00
Steven Armstrong
41ab7390db use constant instead of string for .cdist
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-06 13:02:08 +02:00
Steven Armstrong
4de5f6f58e move Type into its own file
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-06 13:00:17 +02:00
Steven Armstrong
080ca10e19 new package cdist.core
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-06 12:58:08 +02:00
Steven Armstrong
cdba503ff2 move Object class into its own file
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-06 12:57:38 +02:00