Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #468 from apenney/sles-fixes

Further SLES fixes to tests.
  • Loading branch information...
commit c1743f45fd4802c017f3f270ccdd934e30462347 2 parents ca5269f + c3a3e3a
Ashley Penney authored
View
2  spec/acceptance/mysql_bindings_spec.rb
@@ -12,7 +12,7 @@
ruby_package = 'ruby-mysql'
when 'Suse'
java_package = 'mysql-connector-java'
- perl_package = 'perl-DBD-MySQL'
+ perl_package = 'perl-DBD-mysql'
php_package = 'apache2-mod_php53'
python_package = 'python-mysql'
case operatingsystem
View
16 spec/acceptance/mysql_server_spec.rb
@@ -8,10 +8,18 @@
service_provider = 'undef'
mycnf = '/etc/my.cnf'
when 'Suse'
- package_name = 'mysql-community-server'
- service_name = 'mysql'
- service_provider = 'undef'
- mycnf = '/etc/my.cnf'
+ case fact('operatingsystem')
+ when 'OpenSuSE'
+ package_name = 'mysql-community-server'
+ service_name = 'mysql'
+ service_provider = 'undef'
+ mycnf = '/etc/my.cnf'
+ when 'SLES'
+ package_name = 'mysql'
+ service_name = 'mysql'
+ service_provider = 'undef'
+ mycnf = '/etc/my.cnf'
+ end
when 'Debian'
package_name = 'mysql-server'
service_name = 'mysql'
View
10 spec/acceptance/nodesets/sles-11-x64.yml
@@ -0,0 +1,10 @@
+HOSTS:
+ sles-11-x64.local:
+ roles:
+ - master
+ platform: sles-11-x64
+ box : sles-11sp1-x64-vbox4210-nocm
+ box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
+ hypervisor : vagrant
+CONFIG:
+ type: foss

0 comments on commit c1743f4

Please sign in to comment.
Something went wrong with that request. Please try again.