From 753145d64a06312f5b439d5905cf6a88c8498a7e Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Tue, 22 Mar 2016 18:54:59 -0400 Subject: [PATCH] Fix centos7 issue with wheel_mirror.pp Change-Id: Ia51ac3310da38be2acf23bf75e247725659d9cd3 Signed-off-by: Paul Belanger --- modules/openstack_project/manifests/jenkins_params.pp | 2 +- modules/openstack_project/manifests/wheel_mirror_slave.pp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/openstack_project/manifests/jenkins_params.pp b/modules/openstack_project/manifests/jenkins_params.pp index 37ec772358..23b3bba234 100644 --- a/modules/openstack_project/manifests/jenkins_params.pp +++ b/modules/openstack_project/manifests/jenkins_params.pp @@ -85,7 +85,7 @@ class openstack_project::jenkins_params { Package['cgroups-tools'], ] } else { - $mysql_dev_package = 'mysql-devel' + $mysql_dev_package = 'mariadb-devel' $cgroups_tools_package = '' $cgconfig_require = Package['cgroups'] $cgred_require = Package['cgroups'] diff --git a/modules/openstack_project/manifests/wheel_mirror_slave.pp b/modules/openstack_project/manifests/wheel_mirror_slave.pp index 5326c0d0ae..8f518147e3 100644 --- a/modules/openstack_project/manifests/wheel_mirror_slave.pp +++ b/modules/openstack_project/manifests/wheel_mirror_slave.pp @@ -72,7 +72,7 @@ class openstack_project::wheel_mirror_slave ( } 'Redhat': { ensure_packages(['gcc', 'gcc-c++', 'make', - 'python-devel', 'python3-devel', + 'python-devel', 'python34-devel', 'libxml2-devel', 'libxslt-devel', 'libffi-devel', 'readline-devel', 'openssl-devel', 'libyaml-devel', 'zlib-devel',