From 28d6448f94f0d0f0cd2d435a74d6b8121f42a173 Mon Sep 17 00:00:00 2001 From: Joshua Hesketh Date: Wed, 17 Dec 2014 15:01:18 +1100 Subject: [PATCH] Remove python magic zuul-swift-upload is now ran in a virtualenv with python-magic already installed into it. As such we don't need to install python- magic into the system libraries. Depends-On: Ife20d633131a35eb9a07bec6ba875cfb00f55753 Change-Id: Ia1892938dbec1199ed0dceb2da42c79f933dca18 --- modules/openstack_project/manifests/jenkins_params.pp | 2 -- modules/openstack_project/manifests/thick_slave.pp | 1 - 2 files changed, 3 deletions(-) diff --git a/modules/openstack_project/manifests/jenkins_params.pp b/modules/openstack_project/manifests/jenkins_params.pp index 26747a26c0..1f5cbb3cf9 100644 --- a/modules/openstack_project/manifests/jenkins_params.pp +++ b/modules/openstack_project/manifests/jenkins_params.pp @@ -49,7 +49,6 @@ class openstack_project::jenkins_params { # FIXME: no Python 3 on RHEL $python_libvirt_package = 'libvirt-python' $python_lxml_package = 'python-lxml' - $python_magic_package = 'python-magic' $python_requests_package = 'python-requests' $python_zmq_package = 'python-zmq' $rubygems_package = 'rubygems' @@ -137,7 +136,6 @@ class openstack_project::jenkins_params { $python3_package = 'python3.4' $python_libvirt_package = 'python-libvirt' $python_lxml_package = 'python-lxml' - $python_magic_package = 'python-magic' $python_requests_package = 'python-requests' $python_zmq_package = 'python-zmq' if $::lsbdistcodename == 'precise' { diff --git a/modules/openstack_project/manifests/thick_slave.pp b/modules/openstack_project/manifests/thick_slave.pp index 4ca8b57109..3ee90e6b47 100644 --- a/modules/openstack_project/manifests/thick_slave.pp +++ b/modules/openstack_project/manifests/thick_slave.pp @@ -41,7 +41,6 @@ class openstack_project::thick_slave( $::openstack_project::jenkins_params::pkgconfig_package, # for spidermonkey, used by ceilometer $::openstack_project::jenkins_params::python_libvirt_package, $::openstack_project::jenkins_params::python_lxml_package, # for validating openstack manuals - $::openstack_project::jenkins_params::python_magic_package, # for pushing files to swift $::openstack_project::jenkins_params::python_zmq_package, # zeromq unittests (not pip installable) $::openstack_project::jenkins_params::rubygems_package, $::openstack_project::jenkins_params::sbcl_package, # cl-openstack-client testing