Commit Graph

20 Commits

Author SHA1 Message Date
Dan Mick
58174f05e9 calamari_setup: der. Use dict.update() correctly
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2015-03-26 17:54:36 -07:00
Dan Mick
e3ec2fc7c4 calamari_setup: Require test_image to be set
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2015-03-26 17:01:48 -07:00
Dan Mick
dee010163b calamari_setup: centralize config defaults
Make a DEFAULTS dict that is updated by any user parms, so that
defaults are documented centrally and so config.get(key, defval) is
no longer necessary everywhere.

Signed-off-by: Dan Mick <dan.mick@redhat.com>
2015-03-26 17:01:48 -07:00
Dan Mick
3a69c3f494 calamari_setup: remove "build test image" code; add 'test_image' cfgvar
Stop trying to build test images inside this test; presume the test
image is available built externally (in a file path or an http URL).
Config vars ice_tool_dir, ice_version, iceball_location, and
ice_git_location go away in favor of 'test_image', the path to the
testable image (which can still be a tar.gz or an .iso).

Signed-off-by: Dan Mick <dan.mick@redhat.com>
2015-03-26 17:01:48 -07:00
Dan Mick
5644bb5a8d calamari_setup: mounting iso on older distros requires -o loop
Ubuntu's mount/kernel support "mount <file> <mntpnt>" directly;
apparently Centos 6 (and presumably RHEL6) require specifying at
least '-o loop' (a /dev/loopN will be dynamically allocated and removed
on unmount).

Signed-off-by: Dan Mick <dan.mick@redhat.com>
2015-03-26 17:01:48 -07:00
Dan Mick
c571e65671 calamari_setup: oops: ice-tools is still where it was on github.com
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2015-03-20 17:28:10 -07:00
Gregory Meno
81c493c99f calamari_setup: add -y to yum localinstall icesetup
also fix a few flake8 things

Signed-off-by: Ubuntu <ubuntu@vpm047.front.sepia.ceph.com>
2015-03-19 20:14:52 +00:00
Dan Mick
93c0b8a0bd calamari_setup: handle iso, preserving support for tar.gz
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2015-03-18 18:03:21 -07:00
Dan Mick
da668abb92 calamari_setup: small comment/logmsg fixes, correct git user path
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2015-03-18 18:03:18 -07:00
Dan Mick
9087b7da12 calamari_setup: make iceball fetch/creators return path to iceball
Also, widen the concept of "iceball" to include both iso and tar.gz

Signed-off-by: Dan Mick <dan.mick@redhat.com>
2015-03-18 17:16:53 -07:00
Dan Mick
34e7544e12 calamari_setup: Refactor/simplify in preparation for iso support
Signed-off-by: Gregory Meno <gmeno@redhat.com>
2015-03-18 17:16:41 -07:00
Alfredo Deza
d22cd6917b remove unused import in calamari_setup
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2015-02-26 11:25:12 -05:00
Dan Mick
4b6fa9dbb4 tasks/calamari_setup: ice_setup 0.2.0 has added another prompt
Add an extra '\n' to the interaction string to answer it

Signed-off-by: Dan Mick <dan.mick@redhat.com>
2015-02-06 17:33:53 -08:00
Andrew Schoen
b1d9f602c4 Merge pull request #288 from dmick/master
Tweaks to calamari-setup
2015-01-15 16:01:30 -06:00
Dan Mick
4c27048b12 tasks/calamari_setup: build ice-tools virtualenv if building iceball
ice-tools needs a virtualenv populated to properly run to build
an iceball; add the commands to do that.  Also remove the built
iceball when the task exits.

Fixes: #10523
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2015-01-12 19:56:58 -08:00
Dan Mick
bbe22d2fde tasks/calamari_setup: remove HTTP-downloaded iceball, if any
Fixes: #10522
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2015-01-12 19:56:58 -08:00
Dan Mick
4377f00bac tasks/calamari_setup: use ice_version to completely specify iceball
Previously, the task would search for the lexicographically-greatest
filename matching ICE-*.tar.gz; now it builds a specific name
ICE-{ice_version}-{ice_distro}.tar.gz

Fixes: #10521
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2015-01-12 19:56:58 -08:00
Warren Usui
1f557c566c Calamari_setup now allows > 1 mon.
Signed-off-by: Warren Usui <warren.usui@inktank.com>
Fixes: #10261
2015-01-09 16:10:11 -08:00
Warren Usui
852fe69af4 Further changes for calamari_setup.py
Made suggestions from code reviews.
Added no_epel option.
Merged Dan Mick's changes that add the ability to get
iceballs from http URL.
Remove duplicate assignment and added some log.debugs

Signed-off-by: Warren Usui <warren.usui@inktank.com>
2014-11-18 19:06:24 -08:00
Warren Usui
357fd22f04 Add calamari_setup
Calamari_setup can be used to set up a calamari gui for manual testing,
or be run in a suite to test the calamari setup and calamari ceph
installation code.

Fixes: 9759
Signed-off-by: Warren Usui <warren.usui@inktank.com>
2014-11-18 19:06:24 -08:00