Multi distro support for openstack_project base.

Minor updates the openstack_project to support
both Ubuntu and RHEL.

Change-Id: I335addab52224c3fdb17a79e77e7aa3bc505b085
Reviewed-on: https://review.openstack.org/23296
Reviewed-by: Jeremy Stanley <fungi@yuggoth.org>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Monty Taylor <mordred@inaugust.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Dan Prince 2013-03-01 11:44:51 -05:00 committed by Jenkins
parent 22fb5e6da0
commit deb967d956
2 changed files with 24 additions and 10 deletions

View File

@ -7,6 +7,7 @@ class openstack_project::base(
if ($::operatingsystem == 'Ubuntu') {
include apt
}
include openstack_project::params
include openstack_project::users
include sudoers
@ -30,14 +31,8 @@ class openstack_project::base(
}
}
$packages = [
'puppet',
'python-setuptools',
'wget',
]
package { $packages:
ensure => present,
package { $::openstack_project::params::packages:
ensure => present
}
include pip
@ -48,8 +43,8 @@ class openstack_project::base(
}
if ($install_users) {
package { ['byobu', 'emacs23-nox']:
ensure => present,
package { $::openstack_project::params::user_packages:
ensure => present
}
realize (

View File

@ -0,0 +1,19 @@
# Class: openstack_project::params
#
# This class holds parameters that need to be
# accessed by other classes.
class openstack_project::params {
case $::osfamily {
'Redhat': {
$packages = ['puppet', 'python-setuptools', 'wget']
$user_packages = ['byobu', 'emacs-nox']
}
'Debian', 'Ubuntu': {
$packages = ['puppet', 'python-setuptools', 'wget']
$user_packages = ['byobu', 'emacs23-nox']
}
default: {
fail("Unsupported osfamily: ${::osfamily} The 'openstack_project' module only supports osfamily Ubuntu or Redhat(slaves only).")
}
}
}