opendev/system-config
Code Issues Proposed changes

Use the mysql class to get python-mysql.

Browse Source 
Change-Id: I6d6addc2bc0e28b289726cddd6626669dbec1e17
Reviewed-on: https://review.openstack.org/17292
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2012-12-01 08:07:52 -08:00 committed by Jenkins
parent bd2052b07f
commit 3425cb3762
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gerrit/manifests/init.pp
View File

@ -146,10 +146,12 @@ class gerrit(
ensure => present, ensure => present,
} }
package { 'gerritlib': if ! defined(Package['gerritlib']) {
ensure => latest, package { 'gerritlib':
provider => 'pip', ensure => latest,
require => Class[pip], provider => 'pip',
require => Class[pip],
}
} }
file { '/var/log/gerrit': file { '/var/log/gerrit':

7
modules/jeepyb/manifests/init.pp
View File

@ -4,12 +4,6 @@ class jeepyb (
$git_source_repo = 'https://github.com/openstack-ci/jeepyb.git', $git_source_repo = 'https://github.com/openstack-ci/jeepyb.git',
) { ) {
if ! defined(Package['python-mysqldb']) {
package { 'python-mysqldb':
ensure => present,
}
}
if ! defined(Package['python-paramiko']) { if ! defined(Package['python-paramiko']) {
package { 'python-paramiko': package { 'python-paramiko':
ensure => present, ensure => present,
@ -52,6 +46,7 @@ class jeepyb (
cwd => '/opt/jeepyb', cwd => '/opt/jeepyb',
path => '/bin:/usr/bin', path => '/bin:/usr/bin',
refreshonly => true, refreshonly => true,
require => Class['mysql::python'],
subscribe => Vcsrepo['/opt/jeepyb'], subscribe => Vcsrepo['/opt/jeepyb'],
} }