Merge "Update to Fedora 21 and remove Fedora 19 support"

README.md

@@ -87,7 +87,7 @@ useful to install from *git* such that updates to the git repositories are
 immediately effective without reinstallation of packstack and
 **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:
 
     $ yum -y erase openstack-{packstack*,puppet-modules}

packstack/puppet/modules/remote/manifests/params.pp

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

packstack/puppet/templates/nova_compute.pp

@@ -52,26 +52,6 @@ service { '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':
   unless  => '/usr/sbin/tuned-adm active | /bin/grep virtual-host',
   command => '/usr/sbin/tuned-adm profile virtual-host',