opendev
/
system-config
Code Issues Proposed changes

Merge "Fix centos7 issue with wheel_mirror.pp"

This commit is contained in:
Jenkins 2016-03-23 23:38:49 +00:00 committed by Gerrit Code Review
parent 9dc0c981ea 753145d64a
commit 0d935cc212
2 changed files with 2 additions and 2 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

@ -85,7 +85,7 @@ class openstack_project::jenkins_params {
Package['cgroups-tools'], Package['cgroups-tools'],
] ]
} else { } else {
$mysql_dev_package = 'mysql-devel' $mysql_dev_package = 'mariadb-devel'
$cgroups_tools_package = '' $cgroups_tools_package = ''
$cgconfig_require = Package['cgroups'] $cgconfig_require = Package['cgroups']
$cgred_require = Package['cgroups'] $cgred_require = Package['cgroups']

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

@ -72,7 +72,7 @@ class openstack_project::wheel_mirror_slave (
} }
'Redhat': { 'Redhat': {
ensure_packages(['gcc', 'gcc-c++', 'make', ensure_packages(['gcc', 'gcc-c++', 'make',
'python-devel', 'python3-devel', 'python-devel', 'python34-devel',
'libxml2-devel', 'libxslt-devel', 'libxml2-devel', 'libxslt-devel',
'libffi-devel', 'readline-devel', 'libffi-devel', 'readline-devel',
'openssl-devel', 'libyaml-devel', 'zlib-devel', 'openssl-devel', 'libyaml-devel', 'zlib-devel',