Update mysql to c095230

c095230 Merge pull request #727 from cyberious/InstallNameRefacter
ac6ae71 (maint) Package was renamed in server::install - As a result of rename several underlying dependencies broke   this is to update the require dependencies
e7f3f46 Merge pull request #726 from DavidS/fix-acceptance-tests
097efe2 spec_helper_acceptance: Remove conflicting yum install
5820093 Merge pull request #725 from hunner/add_helper
53257df Add helper to install puppet/pe/puppet-agent

Change-Id: Iae013bbb9eab42e49ac70057597ceee05b2545ac

Puppetfile

@@ -107,7 +107,7 @@ mod 'mongodb',
   :git => 'https://github.com/puppetlabs/puppetlabs-mongodb.git'
 
 mod 'mysql',
-  :commit => '2a9ff96e023e306e026455fa87ee5c415b74426e',
+  :commit => 'c095230b9e680043bed2b4a39e672068c6982ebd',
   :git => 'https://github.com/puppetlabs/puppetlabs-mysql.git'
 
 mod 'n1k_vsm',

mysql/Gemfile

@@ -28,6 +28,7 @@ group :system_tests do
     gem 'beaker-rspec',  :require => false
   end
   gem 'serverspec',    :require => false
+  gem 'beaker-puppet_install_helper', :require => false
 end
 
 

mysql/manifests/server/installdb.pp

@@ -19,7 +19,7 @@
       creates   => "${datadir}/mysql",
       logoutput => on_failure,
       path      => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
-      require   => Package[$mysql::server::package_name],
+      require   => Package['mysql-server'],
     }
 
     if $mysql::server::restart {

mysql/manifests/server/service.pp

@@ -31,7 +31,7 @@
     name     => $mysql::server::service_name,
     enable   => $mysql::server::real_service_enabled,
     provider => $mysql::server::service_provider,
-    require  => Package[$mysql::server::package_name],
+    require  => Package['mysql-server'],
   }
 
   # only establish ordering between config file and service if

mysql/spec/spec_helper_acceptance.rb

@@ -1,21 +1,9 @@
 require 'beaker-rspec'
+require 'beaker/puppet_install_helper'
 
-UNSUPPORTED_PLATFORMS = [ 'Windows', 'Solaris', 'AIX' ]
-
-unless ENV['RS_PROVISION'] == 'no' or ENV['BEAKER_provision'] == 'no'
-  # This will install the latest available package on el and deb based
-  # systems fail on windows and osx, and install via gem on other *nixes
-  foss_opts = {
-    :default_action => 'gem_install',
-    :version        => (ENV['PUPPET_VERSION'] || '3.8.1'),
-  }
-
-  if default.is_pe?; then install_pe; else install_puppet( foss_opts ); end
+run_puppet_install_helper
 
-  hosts.each do |host|
-    on hosts, "mkdir -p #{host['distmoduledir']}"
-  end
-end
+UNSUPPORTED_PLATFORMS = [ 'Windows', 'Solaris', 'AIX' ]
 
 RSpec.configure do |c|
   # Project root
@@ -32,13 +20,11 @@
       # Required for binding tests.
       if fact('osfamily') == 'RedHat'
         version = fact("operatingsystemmajrelease")
-        shell("yum localinstall -y http://yum.puppetlabs.com/puppetlabs-release-el-#{version}.noarch.rpm")
         if fact('operatingsystemmajrelease') =~ /7/ || fact('operatingsystem') =~ /Fedora/
           shell("yum install -y bzip2")
         end
       end
 
-      shell("/bin/touch #{default['puppetpath']}/hiera.yaml")
       on host, puppet('module install puppetlabs-stdlib --version 3.2.0'), { :acceptable_exit_codes => [0,1] }
       on host, puppet('module','install','stahnma/epel'), { :acceptable_exit_codes => [0,1] }
     end