]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
Require libvirt devel package on Linux distros
authorZack Cerza <zack@redhat.com>
Fri, 22 Jan 2016 22:19:08 +0000 (15:19 -0700)
committerZack Cerza <zack@redhat.com>
Wed, 27 Jan 2016 19:59:25 +0000 (12:59 -0700)
Also, drop the requirement for the system libvirt Python bindings. This
effectively drops support for old distros like Ubuntu Precise.

Signed-off-by: Zack Cerza <zack@redhat.com>
bootstrap

index fc2d426127a819488aca87cfcba0a0a1c31ac954..02023f53d4db9e44a8afb2768d46228716d4bfce 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -16,18 +16,7 @@ case "$(uname -s)" in
 Linux)
     case "$(lsb_release --id --short)" in
     Ubuntu|Debian)
-        # Note that we install the system version of python-libvirt here
-        # instead of relying on PyPI for that particular module. THe reason for
-        # this is that Ubuntu Precise ships libvirt 0.9.8, and PyPI's
-        # python-libvirt packages require libvirt >= 1.0.2.
-        # Some options for resolving this situation would be choosing some or
-        # all of the following:
-        #   A) Removing support for Precise,
-        #   B) Removing support for downburst,
-        #   C) Adding "Precise" conditionals somewhere, eg. conditionalizing
-        #   this bootstrap script to only use the python-libvirt package on
-        #   Ubuntu Precise.
-        for package in qemu-utils python-dev libssl-dev python-pip python-virtualenv libev-dev python-libvirt libmysqlclient-dev libffi-dev libyaml-dev ; do
+        for package in qemu-utils python-dev libssl-dev python-pip python-virtualenv libev-dev libvirt-dev libmysqlclient-dev libffi-dev libyaml-dev ; do
             if [ "$(dpkg --status -- $package|sed -n 's/^Status: //p')" != "install ok installed" ]; then
                 # add a space after old values
                 missing="${missing:+$missing }$package"
@@ -47,7 +36,7 @@ Linux)
         fi
         ;;
     Fedora)
-        for package in python-pip python-virtualenv libev-devel libvirt-python community-mysql-devel libffi-devel; do
+        for package in python-pip python-virtualenv libev-devel libvirt-devel community-mysql-devel libffi-devel; do
            if [ "$(rpm -q $package)" == "package $package is not installed" ]; then
                missing="${missing:+$missing }$package"
            fi
@@ -66,7 +55,7 @@ Linux)
        fi
        ;;
     "openSUSE project"|"SUSE LINUX")
-        for package in python-pip python-devel python-virtualenv libev-devel libvirt-python libmysqlclient-devel libffi-devel; do
+        for package in python-pip python-devel python-virtualenv libev-devel libvirt-devel libmysqlclient-devel libffi-devel; do
             if [ "$(rpm -q $package)" == "package $package is not installed" ]; then
                 if [ "$(rpm -q --whatprovides $package)" == "no package provides $package" ]; then
                     missing="${missing:+$missing }$package"