Commit graph

1186 commits

Author SHA1 Message Date
Hunter Haugen
aa29170f5b Merge pull request #795 from DavidS/fm-4049-update-msync
(FM-4049) update to modulesync_configs
2016-01-27 08:36:19 -08:00
David Schmitt
7889a85d37 (FM-4049) Update to current msync configs [2c99161] 2016-01-27 14:44:53 +00:00
TP Honey
bc1c44afa4 Merge pull request #794 from DavidS/fm-4563-share-tmpdir
(FM-4563) fix tmpdir to be shared across examples
2016-01-19 11:40:53 +00:00
David Schmitt
95841d3a8c (FM-4563) fix tmpdir to be shared across examples 2016-01-19 10:45:25 +00:00
TP Honey
ecff1f3dd3 Merge pull request #793 from DavidS/fm-4563-workaround-pup-5016
(FM-4563) workaround PUP-5016
2016-01-18 17:27:35 +00:00
David Schmitt
d89062faff (FM-4563) skip idempotency tests on test cells that do have PUP-5016 unfixed
Arguably this decision should be extracted to a more central place,
like puppetlabs_spec_helper or the CI config.
2016-01-18 15:15:52 +00:00
David Schmitt
2de4597ecd (maint) refactor main acceptance suite
This reduces duplication of testing code and makes the intent of the tests
clearer.
2016-01-18 15:15:32 +00:00
David Schmitt
a261a3d493 (maint) fix logic for choosing rspec version
Depending on the ruby version, we either need 3.1.7 to support ruby 1.8,
but since (at least) ruby 2.2 a newer version of rspec is required.
2016-01-18 12:19:21 +00:00
Igor Galić
23672ca326 Merge pull request #779 from jmcclell/patch-1
Fixes edge-case with dropping pre-existing users with grants
2016-01-15 16:00:31 +01:00
Jason McClellan (dsc)
1bad8ae56a Fixes edge-case with dropping pre-existing users with grants
If a user exists in the database upon first Puppet run (for example, in the case of loading a database snapshot) and the run sets that user's :ensure attribute to 'absent', the mysql_grant provider will throw an error when the dependency chain causes it to try to destroy the grants associated with that user because the DROP statement from the mysql_user provider already removed the grants. To fix, we must check if the user exists before revoking the grants.
2016-01-15 08:14:12 -05:00
Igor Galić
0b3e310ba7 Merge pull request #791 from roidelapluie/empty-string-as-parameter
Re-Add the ability to set a empty string as option parameter
2016-01-11 12:20:57 +01:00
Julien Pivotto
e30e0bc958 Re-Add the ability to set a empty string as option parameter
Prior to 136b1aa646 it was possible to
have an empty string as value of a my.cnf parameter, resulting in a line
with just the parameter name.

That commit re-enable that behavior that was removed by accident.
2016-01-08 14:00:31 +01:00
David Schmitt
1cfddec3ff Merge pull request #790 from cadeauthom/service-unmanaged
Move all dependencies to not have them in case of service unmanaged
2016-01-08 10:35:16 +00:00
Thomas Cadeau
b33f9c663e Move all dependencies to not have them in case of service unmanaged 2016-01-07 19:40:19 +01:00
Igor Galić
5e7b999615 Merge pull request #784 from vicinus/master
ensure if service restart to wait till mysql is up
2015-12-21 12:52:04 +01:00
Vicinus, Reinhard
3a49209a6f ensure if service restart to wait till mysql is up 2015-12-19 20:43:49 +01:00
Jesse Lovelace
58a55ade47 Merge pull request #789 from elconas/fix_mysql576_pull_rebase3
(MODULES-2676) Fixed new mysql_datadir provider on CentOS for MySQl 5.7.6 compatibility
2015-12-18 09:57:11 -06:00
Robert Heinzmann
7efc93c3c5 Fixed new mysql_datadir provider on CentOS for MySQl 5.7.6 compatibility 2015-12-17 18:31:17 +01:00
Igor Galić
45419fde6d Merge pull request #787 from obi11235/master
Fixing error when disabling service management and the service does not exist
2015-12-15 17:28:09 +01:00
David Schmitt
c353259fd9 Merge pull request #769 from gabriel403/master
Ubuntu vivid should use systemd not upstart
2015-12-15 16:18:58 +00:00
Gabriel Baker
681d4f856f Ubuntu vivid should use systemd not upstart 2015-12-15 15:38:18 +00:00
Paul
3a29c5e552 Fixing error when disabling service management and the service does not exist 2015-12-14 16:52:37 -05:00
Bryan Jen
51950bf2d1 Merge pull request #786 from DavidS/fix-576-rebase-of-763
Fixed MySQL 5.7.6++ compatibility
2015-12-10 21:38:53 -07:00
Robert Heinzmann
bdf4d0f52d Fixed MySQL 5.7.6++ compatibility
- Added MySQL version and flavour detection support
  - Added mysql_datadir provider/type (replaces Exec[mysql_install_db])
  - Added version specific parameters my.cnf ([mysqld-5.X] sections)
  - Version specific user mangement SQL (ALTER USER for 5.7.6++ ...)

Rebased-By: David Schmitt <david.schmitt@puppetlabs.com>
2015-12-10 18:39:40 +00:00
David Schmitt
60393f7d4a Merge branch '3.6.x' into 'master' 2015-12-08 16:15:13 +00:00
Igor Galić
f06cc1269c Merge pull request #572 from sharumpe/ticket/MODULES-1337-MariaDB_for_OpenSuSE_13.1
Using mariadb in OpenSuSE >= 13.1.
2015-12-02 13:33:44 +01:00
Helen
85e49164ad Merge pull request #780 from tphoney/release_3.6.2
3.6.2 release prep
2015-11-25 11:48:41 +00:00
tphoney
9e2de7f367 3.6.2 release prep 2015-11-24 15:28:56 +00:00
Hunter Haugen
7daa2979ef Merge pull request #781 from bmjen/ruby187
Fix Gemfile to work with ruby 1.8.7
2015-11-20 12:44:31 -08:00
Bryan Jen
608801c838 Fix Gemfile to work with ruby 1.8.7 2015-11-20 11:34:59 -07:00
Bryan Jen
8ae775fb3a Merge pull request #770 from emahags/2702-password_hash
Add ability to input password hash directly
2015-11-19 11:17:37 -07:00
Martin Hagstrom
61058b7610 Don't hash passwords that are already hashed 2015-11-19 07:54:10 +01:00
Tim McLaughlin
3a6a6c6358 Checking major release instead of specific release per @cmurphy. 2015-11-13 11:04:57 -08:00
Tim McLaughlin
47c1eb7386 Merging with upstream changes from https://github.com/puppetlabs/puppetlabs-mysql.git 2015-11-13 10:48:49 -08:00
Hunter Haugen
2f144b3a38 Merge pull request #778 from mentat/acceptance-fix
Use temp cnf file instead of env variable.
2015-11-13 08:10:25 -08:00
Jesse Lovelace
01494814ee Use temp cnf file instead of env variable which creates acceptance test failures. 2015-11-13 10:07:46 -06:00
Igor Galić
d1f1601cd0 Merge pull request #777 from pondohva/mysql_table_exists_fix
(MODULES-2767) fix mysql_table_exists: add check for args.size, fix rspec test
2015-11-09 15:58:45 +01:00
Artur Gadelshin
27323f74e6 (MODULES-2767) fix mysql_table_exists: add check for args.size, fix rspec test 2015-11-09 16:04:38 +03:00
Igor Galić
63e0768775 Merge pull request #776 from pondohva/mysql_table_exists
(MODULES-2767) allow to check if table exists before grant
2015-11-09 13:26:13 +01:00
Artur Gadelshin
cafbc80fcf (MODULES-2767) early return after fail 2015-11-09 12:02:40 +03:00
Artur Gadelshin
e518abd97e (MODULES-2767) allow to check if table exists before grant 2015-11-07 19:23:20 +03:00
Igor Galić
c40b5335c3 Merge pull request #775 from abednarik/fix/master/backUp_script_password_env
(MODULES-2605) Use MYSQL_PWD to avoid mysqldump warnings.
2015-11-07 10:36:16 +01:00
abednarik
055b450d73 (MODULES-2605) Use MYSQL_PWD to avoid mysqldump warnings.
Instead of using password as a command arguments, we are setting MYSQL_ENV variable. See https://dev.mysql.com/doc/refman/5.1/en/password-security-user.html
2015-11-06 15:28:56 -03:00
Bryan Jen
9d9c78fc71 Merge pull request #773 from liaoishere/bug
(MODULES-2787) Fixes for future parser
2015-11-05 16:27:15 -07:00
Bryan Jen
34ba0b598e Merge pull request #774 from puppetlabs/fix_sol
Solaris is not supported by PE
2015-11-05 16:26:56 -07:00
Hunter Haugen
2ae614f82f Solaris is not supported by PE 2015-11-05 10:39:48 -08:00
Liao Penghui
3694ae2a80 (MODULES-2787) Fixes for future parser
The weekday attribute of cron resource will be parse to negetive integer
with future parser. This patch is aim to ensure that the value types of
cron resouce are valid with future parser.
2015-11-05 00:11:15 +08:00
JT (Jonny)
b91630d7a3 Merge pull request #767 from jmk61/MODULES-2675
Fixes unique server_id within my.cnf Ticket/MODULES-2675
2015-10-27 14:52:34 +00:00
Igor Galić
87b7e4de9c Merge pull request #766 from DavidS/modules-2683-fix-root-password-hiding
(MODULES-2683) fix version compare to properly suppress show_diff for…
2015-10-14 13:12:08 +02:00
David Schmitt
5f49c45b2e (MODULES-2683) fix version compare to properly suppress show_diff for root password 2015-10-13 11:29:53 +01:00