Commit graph

661 commits

Author SHA1 Message Date
Robin Gloster
abcea00dcb handle mysql compiled without ssl
mysql doesn't allow ssl=true/false in my.cnf if it hasn't been compiled
with ssl, therefor add a new parameter ssl-disable which makes sure the
template doesn't write anything with ssl to the config.
2014-02-28 21:42:41 +01:00
Hunter Haugen
7884ff744e Merge pull request #471 from bkero/master
Add centos65-x64 acceptance test yaml file
2014-02-26 14:16:01 -08:00
Ben Kero
ce6effe736 change box parameter to ensure vbox436 on centos65 type in acceptance test 2014-02-26 14:10:34 -08:00
Ben Kero
86d2051a5e change vbox version and ensure correct path 2014-02-26 14:09:02 -08:00
Ben Kero
046580323e add centos-65-x64 acceptance test yml file, slight change from 64 2014-02-26 14:04:09 -08:00
Ashley Penney
c8bff9b0ec Merge pull request #470 from apenney/unsupported-tests
Add unsupported infrastructure for excluding OSes we can't test on.
2014-02-26 13:03:31 -05:00
Ashley Penney
d1f4597e47 Add unsupported infrastructure for excluding OSes we can't test on. 2014-02-26 17:54:48 +00:00
Ashley Penney
60197051e4 Merge pull request #469 from apenney/sles-fixes
Last SLES fix, don't use the deprecated parameter name.
2014-02-26 11:42:14 -05:00
Ashley Penney
e7f1e8de9b Last SLES fix, don't use the deprecated parameter name. 2014-02-26 16:39:59 +00:00
Ashley Penney
c1743f45fd Merge pull request #468 from apenney/sles-fixes
Further SLES fixes to tests.
2014-02-26 10:47:24 -05:00
Ashley Penney
c3a3e3ae13 Further SLES fixes to tests. 2014-02-26 15:45:38 +00:00
Ashley Penney
ca5269f813 Merge pull request #467 from apenney/sles-fixes
This fixes:
2014-02-26 09:56:35 -05:00
Ashley Penney
2d1a9f981a This fixes:
* Bindings on SLES
* Makes sure we don't kill the service while testing conf file locations.
2014-02-26 14:54:54 +00:00
Ashley Penney
0f8650610c Merge pull request #466 from apenney/wel-now
As we're deleting /etc/my.cnf, lets not restart MySQL in the middle
2014-02-24 20:24:12 -05:00
Ashley Penney
cbe562b5de As we're deleting /etc/my.cnf, lets not restart MySQL in the middle
of this and cause a terrible explosion.
2014-02-25 01:21:08 +00:00
Hunter Haugen
eebb18e8db Merge pull request #465 from apenney/wel-now
Fix the case of this, ARGH.
2014-02-24 17:20:58 -08:00
Ashley Penney
6271f71aa8 Fix the case of this, ARGH. 2014-02-25 01:18:45 +00:00
Ashley Penney
50798f3255 Merge branch 'master' into 2.2.x 2014-02-24 20:43:58 +00:00
Ashley Penney
f9d9110388 Merge pull request #464 from apenney/fix-sles
Make this work in SLES as well As RedHat.
2014-02-24 15:44:41 -05:00
Ashley Penney
6a93d67bb8 Make this work in SLES as well As RedHat. 2014-02-24 20:39:08 +00:00
Ashley Penney
da384ba8b3 Merge branch '2.2.x' of https://github.com/puppetlabs/puppetlabs-mysql into 2.2.x 2014-02-24 20:17:07 +00:00
Ashley Penney
ac991e8e41 Merge pull request #463 from apenney/fix-oracle
This should help tests on Oracle 6, the lack of epel was breaking the bi...
2014-02-24 15:16:08 -05:00
Ashley Penney
820344f13a This should help tests on Oracle 6, the lack of epel was breaking the binding
tests.
2014-02-24 20:14:00 +00:00
Ashley Penney
1454a5ba19 Merge pull request #459 from dcarley/434-acceptance_tests_for_mysql_database
[#434] Acceptance tests for mysql_database
2014-02-20 12:22:32 -05:00
Dan Carley
b7445ad859 [#434] Acceptance tests for mysql_database
Includes a test for the regression fixed in 30ce3e0.

NB: The `ensure => present` on the resource without any `charset` or
`collate` arguments is intentional because of issue described in #458
2014-02-20 16:57:51 +00:00
Hunter Haugen
d2eea45749 Merge pull request #456 from apenney/221-release
Prepare 2.2.1 release.
2014-02-19 08:58:30 -08:00
Ashley Penney
4628f3557c Prepare 2.2.1 release. 2014-02-19 16:46:54 +00:00
Ashley Penney
9a89120f34 Fix this test for Debian. This is a total hack for now. 2014-02-19 10:08:18 -05:00
Ashley Penney
64163dbd1d Merge pull request #455 from apenney/fix-uninstall-logic
Fix this test for Debian.  This is a total hack for now.
2014-02-18 20:34:44 -05:00
Ashley Penney
f107531113 Fix this test for Debian. This is a total hack for now. 2014-02-18 20:33:52 -05:00
Ashley Penney
98905c501e Fixes for Ubuntu/Debian. 2014-02-18 16:26:41 -05:00
Ashley Penney
84fc716b24 Merge pull request #454 from apenney/pe-test-fails
Fixes for Ubuntu/Debian.
2014-02-18 16:26:16 -05:00
Ashley Penney
5eb6e7084d Fixes for Ubuntu/Debian. 2014-02-18 16:25:42 -05:00
Ashley Penney
34b8ebf6f5 Merge pull request #453 from igalic/ignorance
be more ignorant
2014-02-18 15:36:08 -05:00
Igor Galić
6b21dd5f13 be more ignorant 2014-02-18 21:34:37 +01:00
Ashley Penney
23f69868ef Repair this by ensuring calls to mysql include the database name.
A prior commit accidently broke this, meaning that mysql_database
was querying the mysql defaults instead of each individual database
when trying to determine the current collate settings.
2014-02-18 15:11:31 -05:00
Ashley Penney
7f72505a15 Merge pull request #452 from apenney/pe-test-fails
Repair this by ensuring calls to mysql include the database name.
2014-02-18 15:07:54 -05:00
Ashley Penney
30ce3e0e12 Repair this by ensuring calls to mysql include the database name.
A prior commit accidently broke this, meaning that mysql_database
was querying the mysql defaults instead of each individual database
when trying to determine the current collate settings.
2014-02-18 14:38:21 -05:00
Hunter Haugen
1bc459d05b Merge pull request #448 from apenney/220-release
Prepare 2.2.0 release.
2014-02-13 13:46:56 -08:00
Ashley Penney
a3ad293fca Prepare 2.2.0 release. 2014-02-13 21:27:28 +00:00
Ashley Penney
2a7583f0c1 Merge pull request #447 from apenney/fix-specs-some-more
Fix this so it installs PE appropriately.
2014-02-12 20:49:18 -05:00
Ashley Penney
27a70f5b52 Update nodesets. 2014-02-12 19:30:51 -05:00
Ashley Penney
a38e37546a Fix this so it installs PE appropriately. 2014-02-12 19:27:24 -05:00
Igor Galić
12ef27bc72 Merge pull request #445 from Phil0xF7/fix_multiple_rpm_install
Add check for puppet rpm before trying to install
2014-02-12 11:03:16 +01:00
Phil Pham
e1eed1c3eb update to install package using yum instead of rpm 2014-02-11 14:51:56 -08:00
Ashley Penney
f01f6b836e Merge pull request #446 from apenney/fix-specs
(maint) Fix the specs due to changes to backup.
2014-02-11 17:11:43 -05:00
Ashley Penney
eee60088dd (maint) Fix the specs due to changes to backup. 2014-02-11 17:10:35 -05:00
Ashley Penney
7d2eccc67c Merge pull request #444 from justinstoller/master_gem_source
Allow configuration of Gem source in Gemfile
2014-02-11 10:29:54 -05:00
Ashley Penney
aefbf567c5 Merge pull request #443 from igalic/fix-failing-backup-spec
Fix failing backup spec test
2014-02-10 17:07:20 -05:00
Ashley Penney
ac42ba43fc Merge pull request #413 from igalic/backup-postscript
option to specify a script that runs after backups
2014-02-10 17:06:11 -05:00