opendev/system-config
Code Issues Proposed changes

Remove python magic

Browse Source 
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
This commit is contained in:
Joshua Hesketh 2014-12-17 15:01:18 +11:00 committed by Joshua Hesketh
parent 272d6ccc32
commit 28d6448f94
2 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/openstack_project/manifests/jenkins_params.pp
View File

@ -49,7 +49,6 @@ class openstack_project::jenkins_params {
# FIXME: no Python 3 on RHEL # FIXME: no Python 3 on RHEL
$python_libvirt_package = 'libvirt-python' $python_libvirt_package = 'libvirt-python'
$python_lxml_package = 'python-lxml' $python_lxml_package = 'python-lxml'
$python_magic_package = 'python-magic'
$python_requests_package = 'python-requests' $python_requests_package = 'python-requests'
$python_zmq_package = 'python-zmq' $python_zmq_package = 'python-zmq'
$rubygems_package = 'rubygems' $rubygems_package = 'rubygems'
@ -137,7 +136,6 @@ class openstack_project::jenkins_params {
$python3_package = 'python3.4' $python3_package = 'python3.4'
$python_libvirt_package = 'python-libvirt' $python_libvirt_package = 'python-libvirt'
$python_lxml_package = 'python-lxml' $python_lxml_package = 'python-lxml'
$python_magic_package = 'python-magic'
$python_requests_package = 'python-requests' $python_requests_package = 'python-requests'
$python_zmq_package = 'python-zmq' $python_zmq_package = 'python-zmq'
if $::lsbdistcodename == 'precise' { if $::lsbdistcodename == 'precise' {

1
modules/openstack_project/manifests/thick_slave.pp
View File

@ -41,7 +41,6 @@ class openstack_project::thick_slave(
$::openstack_project::jenkins_params::pkgconfig_package, # for spidermonkey, used by ceilometer $::openstack_project::jenkins_params::pkgconfig_package, # for spidermonkey, used by ceilometer
$::openstack_project::jenkins_params::python_libvirt_package, $::openstack_project::jenkins_params::python_libvirt_package,
$::openstack_project::jenkins_params::python_lxml_package, # for validating openstack manuals $::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::python_zmq_package, # zeromq unittests (not pip installable)
$::openstack_project::jenkins_params::rubygems_package, $::openstack_project::jenkins_params::rubygems_package,
$::openstack_project::jenkins_params::sbcl_package, # cl-openstack-client testing $::openstack_project::jenkins_params::sbcl_package, # cl-openstack-client testing