Commit graph

622 commits

Author SHA1 Message Date
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
Phillip Pham
92046f6a35 Add check for puppet rpm before trying to install
This fixes an issue where subsequent tests will fail when the RS_PROVISION=no and RS_DESTROY=no flag is set for centos. The error is caused by attempting to install the puppet rpm on a machine that already has the puppet rpm installed.
2014-02-07 16:32:57 -08:00
Justin Stoller
e02ebc63d7 Allow configuration of Gem source in Gemfile
This commit allows configuring of the Gem source via an environment
variable "GEM_SOURCE" with a default of 'https://rubygems.org'.
This follows the conventions of Puppet Labs Open Source Platform team.
2014-02-07 12:22:22 -08:00
Igor Galić
51b09b7bc8 Fix failing backup spec tests
This partially reverts 7224f12c25
since after #416 the warnings are actually fixed at the source
2014-02-06 17:21:49 +01:00
Igor Galić
63e0da0b71 option to specify a script that runs after backups
This script could be used to sync backups to a central server, or just
to create a file to let external scripts know that backups are
(sucessfully) done and can be picked up.

The postscript option (defaults to false) and can be either a string or
an array of strings. These strings will be directly put into the
mysqlbackup.sh and as such can either be shell commands, or externally
managed files.
2014-02-06 16:44:07 +01:00
Ashley Penney
f29d95c5b5 Merge pull request #435 from b4ldr/master
Add logic to ignore mysql.events
2014-02-03 11:48:58 -08:00
John Bond
10f346eaca Add logic to ignore mysql.events 2014-01-30 12:31:21 +01:00
Ashley Penney
7caebdb009 Merge pull request #427 from radford/my-cnf-undef
Allow override_options set to undef to completely remove the corresponding key reverting to the mysql default
2014-01-27 11:13:06 -08:00
Igor Galić
c747ea7ab5 Merge pull request #422 from stevesaliman/master
fixed a quoting problem with the mysql_database provider
2014-01-25 03:50:23 -08:00
Ashley Penney
3f9f0f632f Merge pull request #428 from radford/mysql-equates-dash-and-underscore
mysql_deepmerge should treat underscore and dash equivalently, as mysql does
2014-01-24 12:16:50 -08:00
Steve Saliman
80b97d295d Fixed a couple of failing tests 2014-01-24 13:06:34 -07:00
Igor Galić
3cd0938800 Merge pull request #426 from radford/my-cnf-false
Allow an option with a value of false to override something that mysql defaults to true rather than eliding it
2014-01-24 10:59:16 -08:00
Jim Radford
16baff686c mysql_deepmerge should treat underscore and dash equivalently, as mysql does 2014-01-23 22:41:58 -08:00
Jim Radford
56e81a38c8 Allow override_options to set an option to undef to completely remove it
allowing reverting to mysql's default value.

Note that previously a value of :undef would have led to a nonsensical
my.cnf file.
2014-01-23 17:34:27 -08:00
Jim Radford
136b1aa646 Allow options with values of false to override things that mysql default to true
instead of being elided, leaving the default.
2014-01-23 16:53:57 -08:00
Jim Radford
08e8477e96 Noop indent and cleanup the my.cnf template 2014-01-23 16:17:51 -08:00
Hunter Haugen
f348e12a37 Merge pull request #425 from radford/fix-service-provider
Actually use upstart on Ubuntu by fixing misspelled variable name
2014-01-23 13:39:38 -08:00
Jim Radford
dabb29dd6e Actually use upstart on Ubuntu by fixing misspelled variable name 2014-01-23 13:01:08 -08:00
Hunter Haugen
ba0ef0497e Merge pull request #424 from ghoneycutt/test_puppet_3_4
Test against Puppet v3.4.0
2014-01-23 11:09:37 -08:00
Hunter Haugen
9662dfd07f Merge pull request #423 from ghoneycutt/travis_enable_fast_finish
Enable fast finish in Travis
2014-01-23 11:09:19 -08:00
Garrett Honeycutt
708d8eff5a Test against Puppet v3.4.0 2014-01-23 14:05:13 -05:00
Garrett Honeycutt
23f64bbd8d Enable fast finish in Travis
http://blog.travis-ci.com/2013-11-27-fast-finishing-builds/
2014-01-23 14:03:47 -05:00
Steve Saliman
21aca48e02 fixed a problem with the mysql_database provider 2014-01-22 12:44:59 -07:00
Igor Galić
aa3e1d62cf Merge pull request #412 from n1tr0g/master
mysql_grant fixed to properly handle PROCEDURE grants
2014-01-22 09:48:50 -08:00
Igor Galić
5a93c7bc56 Merge pull request #421 from lboynton/patch-1
Remove duplicate service_provider description
2014-01-22 09:20:28 -08:00
Lee Boynton
a5887080e0 Remove duplicate service_provider description
The `service_provider` parameter was explained in the README twice, so I've removed one of them.
2014-01-20 17:19:59 +00:00
Dejan Golja
4f12b0c7f9 Add system test to cover procedure creation scenario 2014-01-20 23:56:26 +11:00
Dejan Golja
ce7b661f10 Bugfix for mysql_grant provider when we try to grant remove privileges
on PROCEDURE. Resolve for bug https://tickets.puppetlabs.com/browse/MODULES-130
(https://github.com/puppetlabs/puppetlabs-mysql/issues/378)
2014-01-20 23:56:26 +11:00
Ashley Penney
8a6f74fdb7 Merge pull request #410 from laurenrother/readme
Update README
2014-01-15 16:41:30 -08:00
Lauren Rother
2091b8b8cf Changes '[version]' and paragraph about override options
Changes '[version]' to 'x.y.z' based on feedback from ashp. Adds additional options to override options paragraphs.
2014-01-08 14:44:03 -08:00
Lauren Rother
c752a3da8f Update README
Edits sentences for spelling, capitalization, and grammar. Edits sentences for contextual consistency and clarity. Adds some missing descriptions.
2014-01-08 13:48:19 -08:00
Igor Galić
e667d52c91 Merge pull request #407 from johnsyweb/fix-documentation
Fix documentation
2014-01-02 16:30:36 -08:00
Ashley Penney
961cece2f9 Merge pull request #408 from zacharyalexstern/master
Fixed typo.
2013-12-27 19:25:00 -08:00
Zachary Alex Stern
0f3664f764 Fixed typo.
Noticed typo, figured I'd fix it.
2013-12-27 14:30:34 -08:00
Pete Johns
85afc5ca95 Fix typos 2013-12-27 19:48:27 +11:00
Pete Johns
52396510e8 s/options_override/override_options/g to prevent confusion 2013-12-27 19:43:35 +11:00
Ashley Penney
edfaeccfa8 Merge pull request #394 from danielfoglio/master
changed log_error to log-error and pid_file to pid-file to match the mys...
2013-12-19 16:39:56 -08:00
Ashley Penney
2df5aee8d5 Merge pull request #403 from apenney/fix-tests
Minor fix to beaker tests.
2013-12-19 16:36:02 -08:00
Ashley Penney
8c64e812d9 Minor fix to beaker tests. 2013-12-19 19:35:20 -05:00
Ashley Penney
c081327b1f Merge pull request #397 from srinathman/feature-create-db-if-exists
Added [if not exists] to [create database] clause.
2013-12-19 16:12:16 -08:00