Merge ganeti-master-cleaner back into ganeti-cleaner
authorIustin Pop <iustin@google.com>
Fri, 5 Oct 2012 21:25:01 +0000 (23:25 +0200)
committerIustin Pop <iustin@google.com>
Mon, 8 Oct 2012 11:09:01 +0000 (13:09 +0200)
commit46118ed2dc278f43f173386c70e64d5359f9d7b5
tree3dad50f2820914256d6da7cc49640a92ff6cff61
parent416eba57fbc48403161ea6a40fe037d6dda36f24
Merge ganeti-master-cleaner back into ganeti-cleaner

As I wrote during/after the review on commit 2958c56, “ganeti-cleaner:
Separate queue cleaning code”, while I appreciated the permission
separation, I didn't like too much the file-based approach:

- it is a very simple script, and lots of the code is duplicated
  between the two; I wouldn't like to see "ganeti-vmcapable-cleaner",
  "ganeti-master-candidate-cleaner", etc. in the future
- ganeti-master-cleaner "pollutes" the namespace, creating
  tab-completion conflicts with ganeti-masterd

This patch simply merges the master-cleaner back into cleaner, while
keeping the separate user permissions scheme, separate log files, etc.

Additionally, it fixes two bugs in the unit-test (not run with set -u
and wrong path in the master-cleaner log files test; yay for even
worse safety than Python?).

And finally, since we have now support for --help-completion, it adds
bash completion support for this script :) (needs to be applied on top
of my argument support patch series).

Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
.gitignore
Makefile.am
autotools/build-bash-completion
daemons/ganeti-cleaner.in
daemons/ganeti-master-cleaner.in [deleted file]
doc/examples/ganeti.cron.in
man/ganeti-cleaner.rst
man/ganeti-master-cleaner.rst [deleted file]
test/ganeti-cleaner_unittest.bash