x/packstack
Code Issues Proposed changes

Update to Fedora 21 and remove Fedora 19 support

Browse Source 
With the release of Fedora 21 the end of life of Fedora 19 will come in
1 month (https://fedoraproject.org/wiki/Fedora_Release_Life_Cycle) and
support for Fedora 19 should be dropped.

Change-Id: Ib34f38ebcab07254be0d5edba2964d476767f998
This commit is contained in:
Christian Berendt 2014-12-09 20:14:19 +01:00
parent 61140c6d16
commit 0aed083ba4
3 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -87,7 +87,7 @@ useful to install from *git* such that updates to the git repositories are
immediately effective without reinstallation of packstack and immediately effective without reinstallation of packstack and
**openstack-puppet-modules**. **openstack-puppet-modules**.
To do this, start with a minimal **Fedora 20** installation. Then remove any To do this, start with a minimal **Fedora 21** installation. Then remove any
relevant packages that might conflict: relevant packages that might conflict:
$ yum -y erase openstack-{packstack*,puppet-modules} $ yum -y erase openstack-{packstack*,puppet-modules}

6
packstack/puppet/modules/remote/manifests/params.pp
View File

@ -6,11 +6,7 @@ class remote::params {
case $::operatingsystem { case $::operatingsystem {
'Fedora': { 'Fedora': {
if (is_integer($::operatingsystemrelease) and $::operatingsystemrelease >= 19) or $::operatingsystemrelease == 'Rawhide' { $mysql_client_package = 'mariadb'
$mysql_client_package = 'mariadb'
} else {
$mysql_client_package = 'mysql'
}
} }
'RedHat', 'CentOS', 'Scientific': { 'RedHat', 'CentOS', 'Scientific': {

20
packstack/puppet/templates/nova_compute.pp
View File

@ -52,26 +52,6 @@ service { 'tuned':
require => Package['tuned'], require => Package['tuned'],
} }
if $::operatingsystem == 'Fedora' and $::operatingsystemrelease == 19 {
# older tuned service is sometimes stucked on Fedora 19
exec { 'tuned-update':
path => ['/sbin', '/usr/sbin', '/bin', '/usr/bin'],
command => 'yum update -y tuned',
logoutput => 'on_failure',
}
exec { 'tuned-restart':
path => ['/sbin', '/usr/sbin', '/bin', '/usr/bin'],
command => 'systemctl restart tuned.service',
logoutput => 'on_failure',
}
Service['tuned'] ->
Exec['tuned-update'] ->
Exec['tuned-restart'] ->
Exec['tuned-virtual-host']
}
exec { 'tuned-virtual-host': exec { 'tuned-virtual-host':
unless => '/usr/sbin/tuned-adm active | /bin/grep virtual-host', unless => '/usr/sbin/tuned-adm active | /bin/grep virtual-host',
command => '/usr/sbin/tuned-adm profile virtual-host', command => '/usr/sbin/tuned-adm profile virtual-host',