openstack/fuel-library
Code Issues Proposed changes

Install correct version of packages on CentOS7

Browse Source 
In CentOS7 we will use one version of ruby (ruby 2.0),
thus we should correct package names to be installed.

Blueprint: master-on-centos7

Compatible with CentOS6 master node

Change-Id: Ia79c96a99e00ab82e2117c576f2dbb1d44e14e45
This commit is contained in:
Dmitry Teselkin 2015-11-18 20:53:40 +03:00 committed by Ivan Suzdal
parent a3ff0ca213
commit 761d7413f8
5 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
deployment/puppet/cobbler/manifests/packages.pp
View File

@ -20,10 +20,17 @@ class cobbler::packages {
$cobbler_package = "cobbler"
$cobbler_web_package = "cobbler-web"
$dnsmasq_package = "dnsmasq"
$cobbler_additional_packages = ["xinetd", "tftp-server", "syslinux", "wget", "python-ipaddr","fence-agents", "bind-utils"]
$django_package = "python-django"
$openssh_package = "openssh-clients"
$pexpect_package = "pexpect"
case $::operatingsystemrelease {
/6.+/: {
$cobbler_additional_packages = ["xinetd", "tftp-server", "syslinux", "wget", "python-ipaddr","fence-agents", "bind-utils"]
}
/7.+/: {
$cobbler_additional_packages = ["xinetd", "tftp-server", "syslinux", "wget", "python-ipaddr","fence-agents-all", "bind-utils"]
}
}
}
/(?i)(debian|ubuntu)/: {
$cobbler_package = "cobbler"

2
deployment/puppet/nailgun/examples/astute-only.pp
View File

@ -60,7 +60,7 @@ if $::osfamily == 'RedHat' {
'ruby21-nailgun-mcagents']
}
'7': {
$mco_packages = ['mcollective-client', 'nailgun-mcagents']
$mco_packages = ['rubygem-mcollective-client', 'nailgun-mcagents']
}
default: {
fail("Unsupported ${::osfamily} release: ${::operatingsystemmajrelease}")

13
deployment/puppet/nailgun/manifests/astute.pp
View File

@ -13,7 +13,18 @@ class nailgun::astute(
default => 'bootstrap',
}
package { 'ruby21-rubygem-astute': }
case $::operatingsystem {
/(?i)(centos|redhat)/: {
case $::operatingsystemrelease {
/6.+/: {
package { 'ruby21-rubygem-astute': }
}
/7.+/: {
package { 'rubygem-astute': }
}
}
}
}
file { '/usr/bin/astuted':
content => template('nailgun/astuted.erb'),

15
deployment/puppet/nailgun/manifests/packages.pp
View File

@ -16,9 +16,22 @@ class nailgun::packages(
nailgun_safe_package { "postgresql-libs": }
nailgun_safe_package { "rsyslog": }
nailgun_safe_package { "rsync": }
nailgun_safe_package { "fence-agents": }
nailgun_safe_package { "python-fuelclient": }
nailgun_safe_package { "screen": }
nailgun_safe_package { "fuel-migrate": }
nailgun_safe_package { "acpid": }
if $::osfamily == 'RedHat' {
case $::operatingsystemmajrelease {
'6': {
nailgun_safe_package { "fence-agents": }
}
'7': {
nailgun_safe_package { "fence-agents-all": }
}
default: {
fail("Unsupported ${::osfamily} release: ${::operatingsystemmajrelease}")
}
}
}
}

3
specs/fuel-library8.0.spec
View File

@ -2,6 +2,7 @@
%{!?version: %define version 8.0.0}
%{!?fuel_release: %define fuel_release 8.0}
%{!?release: %define release 1}
%{!?rhel: %define rhel 7}
Summary: Fuel-Library: a set of deployment manifests of Fuel for OpenStack
Name: %{name}
@ -14,7 +15,7 @@ Source0: %{name}-%{version}.tar.gz
Provides: fuel-library
BuildArch: noarch
BuildRoot: %{_tmppath}/fuel-library-%{version}-%{release}
%if 0%{?rhel} < 7
%if 0%{rhel} < 7
BuildRequires: ruby21-rubygem-librarian-puppet-simple
%else
BuildRequires: rubygem-librarian-puppet-simple