Commit graph

867 commits

Author SHA1 Message Date
Nico Schottelius
90bdf04336 add epilog to parsers, make it look beautiful
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-13 21:30:17 +02:00
Nico Schottelius
e1421280d4 remove debug
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-13 18:18:56 +02:00
Nico Schottelius
7e9d234219 remove obsolete length check
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-13 18:18:12 +02:00
Nico Schottelius
780fd5625e re-implement correct caching
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-13 18:15:04 +02:00
Nico Schottelius
581562aae9 cleanups
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-13 18:05:15 +02:00
Nico Schottelius
4d065443da remove alias deploy for config, does not make things better
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-13 18:00:41 +02:00
Nico Schottelius
8d1b4236d4 fixup most arguments for config
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-13 17:59:11 +02:00
Nico Schottelius
df7f27f94b catch keyboard interrupt for all subcommands
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-13 17:42:43 +02:00
Nico Schottelius
5cbe34ee33 begin to implement subcommand handling
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-13 17:40:28 +02:00
Nico Schottelius
59afce35b5 do not do more checks on the manifest, current ones are good
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-13 16:25:39 +02:00
Nico Schottelius
a5b56f0c41 remove useless function
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-13 16:19:43 +02:00
Nico Schottelius
4e3fec1e9e add hint to pythons octal mode
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-13 16:10:03 +02:00
Nico Schottelius
99b3b0789b remove tmpdir, keep it only if debug is enabled
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-13 00:02:04 +02:00
Nico Schottelius
a09a618c78 prepare cdist-type-emulator transformation
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-12 11:37:20 +02:00
Nico Schottelius
4e95535b7c definitely cleanup remote directory first, so we see more bugs :-)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-12 11:27:20 +02:00
Nico Schottelius
b470a47b15 add working cdist manpage
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-12 11:18:18 +02:00
Nico Schottelius
7de51e8d45 print help in case no hosts are given
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-12 10:52:04 +02:00
Nico Schottelius
5ba6e0bb14 more hints on parallel running
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-12 01:38:51 +02:00
Nico Schottelius
e07328f569 initial support for parallel running
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-12 01:14:35 +02:00
Nico Schottelius
4aff176106 flush and also append \n to header
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-12 00:30:45 +02:00
Nico Schottelius
1a790edbf6 remove context class until we need it
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-12 00:20:06 +02:00
Nico Schottelius
c5355ca104 fixup -c option
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-12 00:16:18 +02:00
Nico Schottelius
8f34f8659b support -V, --version
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-12 00:08:30 +02:00
Nico Schottelius
5260f230e5 support -V, --version
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-12 00:06:59 +02:00
Nico Schottelius
1cc7600c9c begin to make home configurable
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-11 23:54:34 +02:00
Nico Schottelius
2490b983ba ++todo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-11 23:42:53 +02:00
Nico Schottelius
db658328d2 add sh -e header to code to avoid OSError: [Errno 8] Exec format error
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-11 23:11:27 +02:00
Nico Schottelius
0d1f121e21 do not fail without objects
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-11 22:21:46 +02:00
Nico Schottelius
326f2644c7 introduce type_dir() and use it :-)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-11 21:41:56 +02:00
Nico Schottelius
47c5ebcf3f remove parallel and sequential args, until they are working
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-11 21:37:40 +02:00
Nico Schottelius
c5d88435f1 add python link
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-11 21:24:23 +02:00
Nico Schottelius
be2efbbb0d give me a big F
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-11 21:16:42 +02:00
Nico Schottelius
eb2512d4a2 add timing information and setup remote = false by default
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-11 21:15:58 +02:00
Nico Schottelius
b508a2c9ea Merge branch 'weired_idea' 2011-09-11 20:48:09 +02:00
Nico Schottelius
e56bbfea9a less verbose output in default case
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-11 20:45:54 +02:00
Nico Schottelius
34ae8c2926 make code execution happen in the end
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-11 20:41:39 +02:00
Nico Schottelius
4e4d648593 fchmod() does not work on object returned by open(), so use chmod
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-11 20:18:30 +02:00
Nico Schottelius
30a52cab0f begin to save code and make it executable
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-11 20:17:20 +02:00
Nico Schottelius
c78ce344e7 remove debug by default, switch to infolevel and verify -d works
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-11 14:30:05 +02:00
Nico Schottelius
5702706adf fix not so obvious tuple/str error (trailing comma from c&p)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-11 14:11:54 +02:00
Nico Schottelius
c9c808a732 cleanp
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-11 13:55:40 +02:00
Nico Schottelius
c147c74e1e begin to redo object_run()
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-11 13:11:45 +02:00
Nico Schottelius
151022ffd1 support file transfer and begin support for non root logins
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-10 23:46:17 +02:00
Nico Schottelius
ca58841696 Broken code - it's too hot
DEBUG: Shell exec: /bin/sh -e /home/users/nico/p/cdist/conf/type/__directory/gencode-remote
Traceback (most recent call last):
  File "/home/users/nico/p/cdist/bin/cdist", line 557, in <module>
    c.deploy_to()
  File "/home/users/nico/p/cdist/bin/cdist", line 523, in deploy_to
    self.object_run(cdist_object, mode="gencode")
  File "/home/users/nico/p/cdist/bin/cdist", line 491, in object_run
    self.shell_run_or_debug_fail(bin, [bin], env=env)
  File "/home/users/nico/p/cdist/bin/cdist", line 164, in shell_run_or_debug_fail
    subprocess.check_call(*args, **kargs)
  File "/usr/lib/python3.2/subprocess.py", line 480, in check_call
    retcode = call(*popenargs, **kwargs)
  File "/usr/lib/python3.2/subprocess.py", line 467, in call
    return Popen(*popenargs, **kwargs).wait()
  File "/usr/lib/python3.2/subprocess.py", line 741, in __init__
    restore_signals, start_new_session)
  File "/usr/lib/python3.2/subprocess.py", line 1174, in _execute_child
    for k, v in env.items()]
  File "/usr/lib/python3.2/subprocess.py", line 1174, in <listcomp>
    for k, v in env.items()]
  File "/usr/lib/python3.2/os.py", line 581, in fsencode
    raise TypeError("expect bytes or str, not %s" % type(filename).__name__)
TypeError: expect bytes or str, not tuple

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-10 15:36:21 +02:00
Nico Schottelius
636995f44e add some meat to object_run()
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-10 14:45:59 +02:00
Nico Schottelius
c516d8359e support __object_* in run_type_explorer()
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-10 13:19:32 +02:00
Nico Schottelius
4a5100692a add helper methods to get paths from code/gencode
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-10 10:12:01 +02:00
99887fe20f fix typo 2011-09-09 23:27:40 -05:00
Nico Schottelius
74c280911b begin run_object_gencode() and import missing FIXME bits deploy_to()
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-10 00:53:10 +02:00
Nico Schottelius
f5c2ae3049 begin cleanup
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-10 00:48:24 +02:00
Nico Schottelius
bc6201102e todo--
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-10 00:44:15 +02:00
Nico Schottelius
4e2e731374 execute the correct manifest for objects
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-10 00:43:28 +02:00
Nico Schottelius
7eb418c3ab correct env for the various stages
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-10 00:40:45 +02:00
Nico Schottelius
8dff399c96 reloop until no new objects are created anyomer
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-10 00:09:57 +02:00
Nico Schottelius
232618a675 make manifest run more generic
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-10 00:01:16 +02:00
Nico Schottelius
99268591c2 make more use of run_or_fail
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-09 20:54:17 +02:00
Nico Schottelius
14ac0e3ad1 introduce remote_mkdir()
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-09 20:53:09 +02:00
Nico Schottelius
db2562303a in theory transfer the object parameters
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-09 15:28:38 +02:00
Nico Schottelius
722339f3e1 support getting paths of objects and their parameters
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-09 15:16:47 +02:00
Nico Schottelius
6d5a53b7ad fixup list bug by creating a new one
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-09 15:00:09 +02:00
Nico Schottelius
2c15069d96 make remote_cmd a new list
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-09 14:56:51 +02:00
Nico Schottelius
f21ce6a0db commit broken code
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-09 14:51:25 +02:00
Nico Schottelius
20aafe62f5 make use of remote=True flag
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-09 14:30:53 +02:00
Nico Schottelius
c1ad93bccc extend run_or_fail to include remote exec
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-09 14:27:54 +02:00
Nico Schottelius
b2d1d1bee7 begin to modify tuple (bad idea)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-09 14:21:16 +02:00
Nico Schottelius
894c39cd21 store results of type explorer
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-09 12:18:25 +02:00
Nico Schottelius
8889e4a5b0 prepare saving output of type explorers
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-09 08:06:16 +02:00
Nico Schottelius
cbdb5cd05d fixup type explorer run
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 23:01:11 +02:00
Nico Schottelius
7e8362eeed allow zero hosts to be specified, fixup exit_error
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 22:44:25 +02:00
Nico Schottelius
ab0cd9430f add support for the banner :-)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 22:40:12 +02:00
Nico Schottelius
f31f33418f begin to actually prepare the object/type explorers
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 18:03:19 +02:00
Nico Schottelius
97ac276433 implement transfer of type explorers
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 17:52:15 +02:00
Nico Schottelius
4d765a7024 begin type explorer transfer
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 17:45:07 +02:00
Nico Schottelius
03e2db83cd implement list of objects
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 17:01:22 +02:00
Nico Schottelius
0f36ddd649 support object dir
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 15:54:10 +02:00
Nico Schottelius
dbbbf822fe make cdist-type-emulator work
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 15:52:34 +02:00
Nico Schottelius
9ce26e5817 include cdist-type-emulator into path again
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 15:35:29 +02:00
Nico Schottelius
d6db6d0c7e begin move of cdist-type-emulator to lib/ and submit initial_manifest to cdist
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 15:20:25 +02:00
Nico Schottelius
97f7513f6e -old fixme
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 15:14:28 +02:00
Nico Schottelius
2c2a234c74 use sh -e instead of shipped shell=true (see included comment)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 15:13:05 +02:00
Nico Schottelius
4fd8a16e6c use *args not args :-)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 14:52:42 +02:00
Nico Schottelius
1a96f88656 name variable target_host for consistency and easy handling
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 14:50:45 +02:00
Nico Schottelius
c8ce7e98ec use -e to shell
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 14:45:54 +02:00
Nico Schottelius
1d367d5f58 make cdist localhost work again
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 14:17:44 +02:00
Nico Schottelius
979174a568 integrate parser
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 14:11:31 +02:00
Nico Schottelius
c5d960438c import parser from steven
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 14:05:20 +02:00
Nico Schottelius
9533e579b3 finish run of initial manifest, finish shell_run_or_debug_fail()
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 14:04:30 +02:00
Nico Schottelius
ddff3e8b57 support changing the initial manifest
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 11:55:29 +02:00
Nico Schottelius
908d9d06f9 prepend __explorer on global explorer run
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 11:50:30 +02:00
Nico Schottelius
506e0e6c81 +better logging
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 11:45:58 +02:00
Nico Schottelius
8fa576152e make it work again :-)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 11:44:58 +02:00
Nico Schottelius
7d3c67c178 make it work again :-)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 11:44:04 +02:00
Nico Schottelius
4c1939829e import logging, begin to put constant stuff in module
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 11:08:44 +02:00
Nico Schottelius
e8360df96b allow passing arguments to Popen()
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 09:47:30 +02:00
Nico Schottelius
0dc6af2512 wrap into a class
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 04:22:40 +02:00
Nico Schottelius
e8a6d89e3c wrap into a class
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 04:22:21 +02:00
Nico Schottelius
572401e4f8 commit broken stuff
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 03:56:59 +02:00
Nico Schottelius
7a7413f1f4 pause
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 03:31:58 +02:00
Nico Schottelius
ff2d5629d6 submit string on failed error
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 03:28:06 +02:00
Nico Schottelius
9036f8c4cc executing explorers works
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 03:24:27 +02:00
Nico Schottelius
85df71c9fa executing explorers works
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 03:23:18 +02:00
Nico Schottelius
ef925714d5 transfer explorer
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 02:57:47 +02:00
Nico Schottelius
d0eeafd228 also add some bugs
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 02:56:02 +02:00
Nico Schottelius
78a5bbf6e8 remove the currently broken init()
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 02:52:38 +02:00
Nico Schottelius
94fc5b3c91 add remove_remote_dir()
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 02:51:45 +02:00
Nico Schottelius
6e3c228a6f transfer_dir() added
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 02:46:09 +02:00
Nico Schottelius
09c58e2327 exit, if there are no global explorers
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 02:39:24 +02:00
Nico Schottelius
11750515e1 finish global_explorer_directory()
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 02:16:13 +02:00
Nico Schottelius
c2873a8fa0 ipmlement base_directory
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 02:12:48 +02:00
Nico Schottelius
ffd7f4b251 --todo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 01:48:23 +02:00
Nico Schottelius
89964b32dd in theory, init_deploy is done
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 01:41:54 +02:00
Nico Schottelius
a90751dcff begin to implmenent remote execution
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 01:36:22 +02:00
Nico Schottelius
9711a5612d partly implement run_or_fail, init_deploy
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 01:21:15 +02:00
Nico Schottelius
34bb391937 +header
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 01:01:25 +02:00
Nico Schottelius
1b84a28511 add cdist
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-09-08 00:41:37 +02:00
Nico Schottelius
dc820cf31e also filter stderr and add hostname as prefix
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-07-28 10:54:39 +02:00
Steven Armstrong
aa6b655cd3 new executable that uses its stdin as the initial manifest
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-07-01 16:02:03 +02:00
Steven Armstrong
dd949d5984 explorers for types with clashing names not pushed to target
Thorsten Steenbock reported a bug where types with similar names, e.g
__first
__first_second
would interfere when transfering explorers to the target host.

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-07-01 13:18:18 +02:00
Nico Schottelius
d7ae5c88e6 and EXIT!
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-06-08 21:26:13 +02:00
Nico Schottelius
6f99de75a5 only trap signals in front end scripts
Otherwise children execute kill egain and the shell segfaults

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-06-08 21:23:53 +02:00
Nico Schottelius
56cf428d4c use kill 0 on SIGINT and SIGTERM, but not on trap EXIT
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-06-08 21:19:05 +02:00
Nico Schottelius
c1d17f8d14 no need for execute bit on cdist-config
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-05-12 17:56:50 +02:00
Nico Schottelius
916d355891 remove kill 0 in cdist-config from master branch until it works :-)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-05-12 17:08:18 +02:00
Nico Schottelius
14708a9c59 -SIG
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-05-10 17:12:02 +02:00
Nico Schottelius
ee076ef7e9 only kill children, if we got signalled
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-05-10 17:11:15 +02:00
Nico Schottelius
a202826a62 also kill children in cdist core
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-05-10 17:07:52 +02:00
Nico Schottelius
b1f10f2936 use kill 0 to kill all children
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-05-10 16:58:59 +02:00
Nico Schottelius
8b4196e023 Prepare release of 1.7.0 (1) 2011-05-10 15:49:35 +02:00
Nico Schottelius
d8cd9e0118 allow debug to be unset when using
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-05-10 10:04:37 +02:00
Nico Schottelius
ae538362e6 __cdist prefix in bin/cdist-code-run
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-28 19:01:21 +02:00
Nico Schottelius
ac157aa442 allow no code in cdist-code-run
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-28 15:21:35 +02:00
Nico Schottelius
49ebb77ab3 adjust __cdist_object_code cal in cdist-code-run
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-28 15:16:28 +02:00
Nico Schottelius
5e34bebc05 cleanup in cdist-object-gencode
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-28 15:07:13 +02:00
Nico Schottelius
bba8c641e5 remove unecessary cd
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-28 15:00:20 +02:00
Nico Schottelius
fc01ceb914 in theory: do not generate code anymore
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-28 14:59:57 +02:00
Nico Schottelius
93ef73a645 move gencode type path combination into cdist-config (also for __cdist_type_gencode)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-28 14:46:35 +02:00
Nico Schottelius
99bf12a48f move gencode type path combination into cdist-config
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-28 14:45:14 +02:00
Nico Schottelius
1ff135a9d5 begin to move parts to cdist-object-gencode
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-28 14:37:33 +02:00
Nico Schottelius
266b608357 always setup e
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-21 12:06:05 +02:00
Nico Schottelius
a16523a72f begin to add code to kill subprocesses on exit
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-21 12:03:32 +02:00
Nico Schottelius
7d8a58e6d1 and - debug
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-20 13:47:36 +02:00
Nico Schottelius
43526d41a5 remove set -e from bin/cdist-mass-deploy and bogus shift
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-20 13:46:08 +02:00
Nico Schottelius
efe1d3db79 Prepare files for the next release 2011-04-19 22:43:18 +02:00
Nico Schottelius
20f0a788b1 use -gt consistently
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-17 11:32:11 +02:00
Nico Schottelius
91106ba0af comment for sysadmins
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-17 00:11:23 +02:00
Nico Schottelius
01a541d017 use different count to ignore case of 0 hosts
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-17 00:10:07 +02:00
Nico Schottelius
471b8a7308 pass hostname to filter
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-16 23:57:46 +02:00
Nico Schottelius
9c60a81d8a decrease first, last number is unused
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-16 23:57:20 +02:00
Nico Schottelius
0122ccc3ee in theory finish new error catching + displaying code
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-16 23:56:10 +02:00
Nico Schottelius
da1d3fbc04 begin new error catching code and make filter a function
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-16 23:51:24 +02:00
Nico Schottelius
231eb1214c refuse to try to recreate a type
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-16 23:33:48 +02:00
Nico Schottelius
10ebdd87d4 fixes + local and remote gencode
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-16 23:31:15 +02:00
Nico Schottelius
0e42e98bb9 begin to cleanup bin/cdist-type-template
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-16 23:27:01 +02:00
Nico Schottelius
10cc25330c remove space at the end of the line
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-08 10:57:18 +02:00
Nico Schottelius
4873b046ba allow user to change __cdist_tmp_base_dir to avoid using /tmp
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-08 10:52:03 +02:00
Nico Schottelius
c3341df08d Upgrade to 1.6.1
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-07 09:56:59 +02:00
Nico Schottelius
b0391ac0c9 BUGFIX: do not fail, if cache/ is missing
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 22:09:04 +02:00
Nico Schottelius
0a3a434269 remove ... dots ... make ... me ...feel ... weired
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:51:43 +02:00
Nico Schottelius
bc1c7f104e core prefix
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:50:49 +02:00
Nico Schottelius
31164be1d0 remove full path to manifest in logging (will be presented on error anyway)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:44:41 +02:00
Nico Schottelius
e7ad5987e4 + self variable
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:43:32 +02:00
Nico Schottelius
315de6fe15 log improvements
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:41:40 +02:00
Nico Schottelius
b86d3ba26a remove ugly OBJECT messages
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:38:41 +02:00
Nico Schottelius
c0a83f9d85 ++__cdist_exit_err
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:22:44 +02:00
Nico Schottelius
49e8efdaf5 object self, not object
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:20:58 +02:00
Nico Schottelius
bb96163315 blame on the right file
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:19:47 +02:00
Nico Schottelius
05c8634f8b correctly use __cdist_echo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:19:21 +02:00
Nico Schottelius
fb0dafba5c make faulty code a warning
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:18:15 +02:00
Nico Schottelius
838d43d74c do not fail if code is missing, but inform
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:17:11 +02:00
Nico Schottelius
35d4760c13 ++__cdist_echo ++todo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:15:11 +02:00
Nico Schottelius
4a7c6c2738 ++__cdist_echo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:12:00 +02:00
Nico Schottelius
afdecb8836 ++__cdist_echo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:10:34 +02:00
Nico Schottelius
0580406ff2 there is no __cdist_object in this context
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:08:40 +02:00
Nico Schottelius
96c4024a51 bugfix + real use of __cdist_echo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:07:39 +02:00
Nico Schottelius
df58c4e5f5 echo, not info
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 21:03:37 +02:00
Nico Schottelius
a08bd18f4e make first real use of new __cdist_echo with __cdist_object_self setup
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:59:57 +02:00
Nico Schottelius
caed694dee ++__cdist_echo + FIXME
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:58:34 +02:00
Nico Schottelius
2162d444b3 better logging in __cdist_exec_fail_on_error
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:55:53 +02:00
Nico Schottelius
1f4e8fe564 do not create code if there is no gencode
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:54:34 +02:00
Nico Schottelius
8924a9583d ++__cdist_echo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:52:14 +02:00
Nico Schottelius
ec513eae49 ++__cdist_echo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:51:17 +02:00
Nico Schottelius
cb5fc962b3 use __cdist prefix
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:50:09 +02:00
Nico Schottelius
d0434ea56b 1.6.1++
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:46:40 +02:00
Nico Schottelius
d75f2d4d29 ++__cdist_echo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:38:31 +02:00
Nico Schottelius
d000de2be9 code, not gencode
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:36:21 +02:00
Nico Schottelius
f08a9eaaa9 +: after object_self
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:35:27 +02:00
Nico Schottelius
9d5d0b8cdd always setup __cdist_echo_prefix
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:34:46 +02:00
Nico Schottelius
290915ee64 __cdist_echo++
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:34:07 +02:00
Nico Schottelius
e3f27f1794 allow empty $__cdist_object_self
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:31:19 +02:00
Nico Schottelius
e4390da300 requiring set +e in __cdist_exec_fail_on_error to catch error ourselves
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:18:31 +02:00
Nico Schottelius
d31833a78e begin use of __cdist_echo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:16:16 +02:00
Nico Schottelius
813b4e1f2b use __cdist_exec_fail_on_error in bin/cdist-code-run
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:11:39 +02:00
Nico Schottelius
08d18ec1ec show broken code
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:05:58 +02:00
Nico Schottelius
90f5d47164 add warning level
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:04:34 +02:00
Nico Schottelius
723046fdd2 introduce and use __cdist_echo
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 20:00:36 +02:00
Nico Schottelius
4aa0d80310 prepare files for 1.6.0 release
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 19:36:57 +02:00
Nico Schottelius
1973ac0787 use wait instead of fg
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 14:22:44 +02:00
Nico Schottelius
75509dc8a5 PLUS whitespace (not only, but also for Steven)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 14:18:14 +02:00
Nico Schottelius
5aa32fa42d beautify parallel mode
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 14:16:33 +02:00
Nico Schottelius
b9ef12b48d enhance cdist-mass-deploy and add parallel execution
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 14:05:47 +02:00
Nico Schottelius
32c2612934 ge vs lt
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 13:59:34 +02:00
Nico Schottelius
e84ab9e14c in theory finish cdist-mass-deploy
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 13:58:00 +02:00
Nico Schottelius
7496639e1f add template for cdist-mass-deploy
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-06 13:56:16 +02:00
Steven Armstrong
71765210bb rename cdist-object-process to cdist-object-prepare
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-04-05 22:55:46 +02:00
Nico Schottelius
c5925ff331 prepare version change
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-05 17:43:10 +02:00
Nico Schottelius
c532a2ccd3 remove one Error of Error: Error: /home/users/nico/oeffentlich/rechner/projekte/cdist-used/conf/type/__nico_desktop/manifest exited non-zero.
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-04-02 02:22:08 +02:00
Nico Schottelius
a648aa5333 fix cdist-object-all: ensure output directory exists
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 22:25:56 +02:00
Nico Schottelius
7d0877d8ce ++cleanups
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 20:29:22 +02:00
Nico Schottelius
5359ed863c +cleanups++
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 20:21:08 +02:00
Nico Schottelius
b3d7cf3192 more cleanups, __cdist prefixes
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-03-31 19:35:26 +02:00
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