summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Stanley <fungi@yuggoth.org>2013-04-24 02:27:21 +0000
committerJenkins <jenkins@review.openstack.org>2013-04-25 21:36:58 +0000
commit94496f84340f552cb40dcf89e50592447c970abc (patch)
tree1e14c4c8530f2a701c43563b36275ed1dad3a9c4
parent2a7c4b3d8313ae7e9fb1194f7df6253074e41410 (diff)
Jenkins slave puppetry for CentOS.
The install scripts now look for CentOS in release files. Also some instances of facter's operatingsystem are switched to osfamily and capitalization of RedHat is normalized to match what facter uses. Change-Id: I3bbca5481d0d5e6de9e62bfd6e2b0a85264ed6ed Reviewed-on: https://review.openstack.org/27398 Reviewed-by: Clark Boylan <clark.boylan@gmail.com> Reviewed-by: James E. Blair <corvus@inaugust.com> Approved: Jeremy Stanley <fungi@yuggoth.org> Reviewed-by: Jeremy Stanley <fungi@yuggoth.org> Tested-by: Jenkins
-rw-r--r--manifests/init.pp2
-rw-r--r--manifests/params.pp2
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/init.pp b/manifests/init.pp
index 461e29c..7103de0 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -12,7 +12,7 @@ class pip {
12 require => Package[$::pip::params::python_devel_package] 12 require => Package[$::pip::params::python_devel_package]
13 } 13 }
14 14
15 if ($::operatingsystem == 'Redhat' or $::operatingsystem == 'Fedora') { 15 if ($::osfamily == 'RedHat') {
16 16
17 file { '/usr/bin/pip': 17 file { '/usr/bin/pip':
18 ensure => 'link', 18 ensure => 'link',
diff --git a/manifests/params.pp b/manifests/params.pp
index 5acb02c..c580feb 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -4,7 +4,7 @@
4# accessed by other classes. 4# accessed by other classes.
5class pip::params { 5class pip::params {
6 case $::osfamily { 6 case $::osfamily {
7 'Fedora', 'Redhat': { 7 'RedHat': {
8 $python_devel_package = 'python-devel' 8 $python_devel_package = 'python-devel'
9 $python_pip_package = 'python-pip' 9 $python_pip_package = 'python-pip'
10 } 10 }