From fecca12deef6a4e7f5cca395f7dbb983b4ca47b3 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 9 May 2013 03:28:11 +0000 Subject: [PATCH] Install correct Python YAML package on CentOS/RH. * modules/jeepyb/manifests/init.pp: Special-case the Python YAML bindings package name depending on facter osfamily. Change-Id: Iaa11e601e387428040a5d992219bd67812d8bac8 Reviewed-on: https://review.openstack.org/28652 Approved: Jeremy Stanley Reviewed-by: Jeremy Stanley Tested-by: Jenkins --- modules/jeepyb/manifests/init.pp | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/modules/jeepyb/manifests/init.pp b/modules/jeepyb/manifests/init.pp index de7dec7b56..15feae74e0 100644 --- a/modules/jeepyb/manifests/init.pp +++ b/modules/jeepyb/manifests/init.pp @@ -37,9 +37,23 @@ class jeepyb ( # A lot of things need yaml, be conservative requiring this package to avoid # conflicts with other modules. - if ! defined(Package['python-yaml']) { - package { 'python-yaml': - ensure => present, + case $::osfamily { + 'Debian': { + if ! defined(Package['python-yaml']) { + package { 'python-yaml': + ensure => present, + } + } + } + 'RedHat': { + if ! defined(Package['PyYAML']) { + package { 'PyYAML': + ensure => present, + } + } + } + default: { + fail("Unsupported osfamily: ${::osfamily} The 'jeepyb' module only supports osfamily Debian or RedHat.") } }