opuppet/module-puppetlabs-mysql
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #514 from mhaskel/merge-2.2.x

Browse source 
Merge 2.2.x
This commit is contained in:
Ashley Penney 2014-05-09 17:20:47 -04:00
commit 35620437cf
7 changed files with 264 additions and 189 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

322
CHANGELOG → CHANGELOG.md
View file

@ -1,6 +1,30 @@
2014-02-19 - Version 2.2.1
##2014-03-04 - Supported Release 2.2.3
###Summary
Summary:
This is a supported release. This release removes a testing symlink that can
cause trouble on systems where /var is on a seperate filesystem from the
modulepath.
####Features
####Bugfixes
####Known Bugs
* No known bugs
##2014-03-04 - Supported Release 2.2.2
###Summary
This is a supported release. Mostly comprised of enhanced testing, plus a
bugfix for Suse.
####Bugfixes
- PHP bindings on Suse
- Test fixes
####Known Bugs
* No known bugs
##2014-02-19 - Version 2.2.1
###Summary
Minor release that repairs mysql_database{} so that it sees the correct
collation settings (it was only checking the global mysql ones, not the
@ -8,19 +32,19 @@ actual database and constantly setting it over and over since January 22nd).
Also fixes a bunch of tests on various platforms.
2014-02-13 - Version 2.2.0
Summary:
##2014-02-13 - Version 2.2.0
Features:
###Summary
####Features
- Add `backupdirmode`, `backupdirowner`, `backupdirgroup` to
mysql::server::backup to allow customizing the mysqlbackupdir.
- Support multiple options of the same name, allowing you to
do 'replicate-do-db' => ['base1', 'base2', 'base3'] in order to get three
lines of replicate-do-db = base1, replicate-do-db = base2 etc.
-
Bugfixes:
####Bugfixes
- Fix `restart` so it actually stops mysql restarting if set to false.
- DRY out the defaults_file functionality in the providers.
- mysql_grant fixed to work with root@localhost/@.
@ -36,14 +60,13 @@ Bugfixes:
- Ensure mysql::server:root_password runs before mysql::server::backup
- Fix options_override -> override_options in the README.
- Extensively rewrite the README to be accurate and awesome.
- Move to requiring stdlib 3.2.0, shipped in PE3.0
- Add many new tests.
2013-11-13 - Version 2.1.0
##2013-11-13 - Version 2.1.0
Summary:
###Summary
The most important changes in 2.1.0 are improvements to the my.cnf creation,
as well as providers. Setting options to = true strips them to be just the
@ -56,13 +79,13 @@ Last, the new hiera integration functionality should make it easier to
externalize all your grants, users, and, databases. Another great set of
community submissions helped to make this release.
Features:
####Features
- Some options can not take a argument. Gets rid of the '= true' when an
option is set to true.
- Easier hiera integration: Add hash parameters to mysql::server to allow
specifying grants, users, and databases.
Fixes:
####Bugfixes
- Fix an issue with lowercase privileges in mysql_grant{} causing them to be reapplied needlessly.
- Changed defaults-file to defaults-extra-file in providers.
- Ensure /root/.my.cnf is 0600 and root owned.
@ -71,21 +94,23 @@ Fixes:
- Documentation improvements.
- Various test fixes.
2013-10-21 - Version 2.0.1
Summary:
##2013-10-21 - Version 2.0.1
###Summary
This is a bugfix release to handle an issue where unsorted mysql_grant{}
privileges could cause Puppet to incorrectly reapply the permissions on
each run.
Fixes:
####Bugfixes
- Mysql_grant now sorts privileges in the type and provider for comparison.
- Comment and test tweak for PE3.1.
2013-10-14 - Version 2.0.0
Summary:
##2013-10-14 - Version 2.0.0
###Summary
(Previously detailed in the changelog for 2.0.0-rc1)
@ -102,51 +127,54 @@ with the hash format: { 'section' => { 'thing' => 'value' }}
* mysql attempts backwards compatibility by forwarding all parameters to
mysql::server.
2013-10-09 - Version 2.0.0-rc5
Summary:
##2013-10-09 - Version 2.0.0-rc5
###Summary
Hopefully the final rc! Further fixes to mysql_grant (stripping out the
cleverness so we match a much wider range of input.)
Fixes:
####Bugfixes
- Make mysql_grant accept '.*'@'.*' in terms of input for user@host.
2013-10-09 - Version 2.0.0-rc4
Summary:
##2013-10-09 - Version 2.0.0-rc4
###Summary
Bugfixes to mysql_grant and mysql_user form the bulk of this rc, as well as
ensuring that values in the override_options hash that contain a value of ''
are created as just "key" in the conf rather than "key =" or "key = false".
Fixes:
####Bugfixes
- Improve mysql_grant to work with IPv6 addresses (both long and short).
- Ensure @host users work as well as user@host users.
- Updated my.cnf template to support items with no values.
2013-10-07 - Version 2.0.0-rc3
Summary:
##2013-10-07 - Version 2.0.0-rc3
###Summary
Fix mysql::server::monitor's use of mysql_user{}.
Fixes:
####Bugfixes
- Fix myql::server::monitor's use of mysql_user{} to grant the proper
permissions. Add specs as well. (Thanks to treydock!)
2013-10-03 - Version 2.0.0-rc2
Summary:
##2013-10-03 - Version 2.0.0-rc2
###Summary
Bugfixes
Fixes:
####Bugfixes
- Fix a duplicate parameter in mysql::server
2013-10-03 - Version 2.0.0-rc1
Summary:
##2013-10-03 - Version 2.0.0-rc1
###Summary
This module has been completely refactored and works significantly different.
The changes are broad and touch almost every piece of the module.
@ -161,9 +189,10 @@ with the hash format: { 'section' => { 'thing' => 'value' }}
* mysql attempts backwards compatibility by forwarding all parameters to
mysql::server.
2013-09-23 - Version 1.0.0
---
##2013-09-23 - Version 1.0.0
Summary:
###Summary
This release introduces a number of new type/providers, to eventually
replace the database_ ones. The module has been converted to call the
@ -173,121 +202,122 @@ fixes, additional options, and work with puppet resource.
This 1.0.0 release precedes a large refactoring that will be released
almost immediately after as 2.0.0.
Features:
####Features
- Added mysql_grant, mysql_database, and mysql_user.
- Add `mysql::bindings` class and refactor all other bindings to be contained underneath mysql::bindings:: namespace.
- Added support to back up specified databases only with 'mysqlbackup' parameter.
- Add option to mysql::backup to set the backup script to perform a mysqldump on each database to its own file
Bugfixes:
####Bugfixes
- Update my.cnf.pass.erb to allow custom socket support
- Add environment variable for .my.cnf in mysql::db.
- Add HOME environment variable for .my.cnf to mysqladmin command when
(re)setting root password
2013-07-15 - Version 0.9.0
Features:
---
##2013-07-15 - Version 0.9.0
####Features
- Add `mysql::backup::backuprotate` parameter
- Add `mysql::backup::delete_before_dump` parameter
- Add `max_user_connections` attribute to `database_user` type
Bugfixes:
####Bugfixes
- Add client package dependency for `mysql::db`
- Remove duplicate `expire_logs_days` and `max_binlog_size` settings
- Make root's `.my.cnf` file path dynamic
- Update pidfile path for Suse variants
- Fixes for lint
2013-07-05 - Version 0.8.1
Bugfixes:
##2013-07-05 - Version 0.8.1
####Bugfixes
- Fix a typo in the Fedora 19 support.
2013-07-01 - Version 0.8.0
Features:
##2013-07-01 - Version 0.8.0
####Features
- mysql::perl class to install perl-DBD-mysql.
- minor improvements to the providers to improve reliability
- Install the MariaDB packages on Fedora 19 instead of MySQL.
- Add new `mysql` class parameters:
- `max_connections`: The maximum number of allowed connections.
- `manage_config_file`: Opt out of puppetized control of my.cnf.
- `ft_min_word_len`: Fine tune the full text search.
- `ft_max_word_len`: Fine tune the full text search.
- `max_connections`: The maximum number of allowed connections.
- `manage_config_file`: Opt out of puppetized control of my.cnf.
- `ft_min_word_len`: Fine tune the full text search.
- `ft_max_word_len`: Fine tune the full text search.
- Add new `mysql` class performance tuning parameters:
- `key_buffer`
- `thread_stack`
- `thread_cache_size`
- `myisam-recover`
- `query_cache_limit`
- `query_cache_size`
- `max_connections`
- `tmp_table_size`
- `table_open_cache`
- `long_query_time`
- `key_buffer`
- `thread_stack`
- `thread_cache_size`
- `myisam-recover`
- `query_cache_limit`
- `query_cache_size`
- `max_connections`
- `tmp_table_size`
- `table_open_cache`
- `long_query_time`
- Add new `mysql` class replication parameters:
- `server_id`
- `sql_log_bin`
- `log_bin`
- `max_binlog_size`
- `binlog_do_db`
- `expire_logs_days`
- `log_bin_trust_function_creators`
- `replicate_ignore_table`
- `replicate_wild_do_table`
- `replicate_wild_ignore_table`
- `expire_logs_days`
- `max_binlog_size`
- `server_id`
- `sql_log_bin`
- `log_bin`
- `max_binlog_size`
- `binlog_do_db`
- `expire_logs_days`
- `log_bin_trust_function_creators`
- `replicate_ignore_table`
- `replicate_wild_do_table`
- `replicate_wild_ignore_table`
- `expire_logs_days`
- `max_binlog_size`
Bugfixes:
####Bugfixes
- No longer restart MySQL when /root/.my.cnf changes.
- Ensure mysql::config runs before any mysql::db defines.
2013-06-26 - Version 0.7.1
Bugfixes:
##2013-06-26 - Version 0.7.1
####Bugfixes
- Single-quote password for special characters
- Update travis testing for puppet 3.2.x and missing Bundler gems
2013-06-25 - Version 0.7.0
##2013-06-25 - Version 0.7.0
This is a maintenance release for community bugfixes and exposing
configuration variables.
* Add new `mysql` class parameters:
- `basedir`: The base directory mysql uses
- `bind_address`: The IP mysql binds to
- `client_package_name`: The name of the mysql client package
- `config_file`: The location of the server config file
- `config_template`: The template to use to generate my.cnf
- `datadir`: The directory MySQL's datafiles are stored
- `default_engine`: The default engine to use for tables
- `etc_root_password`: Whether or not to add the mysql root password to
- `basedir`: The base directory mysql uses
- `bind_address`: The IP mysql binds to
- `client_package_name`: The name of the mysql client package
- `config_file`: The location of the server config file
- `config_template`: The template to use to generate my.cnf
- `datadir`: The directory MySQL's datafiles are stored
- `default_engine`: The default engine to use for tables
- `etc_root_password`: Whether or not to add the mysql root password to
/etc/my.cnf
- `java_package_name`: The name of the java package containing the java
- `java_package_name`: The name of the java package containing the java
connector
- `log_error`: Where to log errors
- `manage_service`: Boolean dictating if mysql::server should manage the
- `log_error`: Where to log errors
- `manage_service`: Boolean dictating if mysql::server should manage the
service
- `max_allowed_packet`: Maximum network packet size mysqld will accept
- `old_root_password`: Previous root user password
- `php_package_name`: The name of the phpmysql package to install
- `pidfile`: The location mysql will expect the pidfile to be
- `port`: The port mysql listens on
- `purge_conf_dir`: Value fed to recurse and purge parameters of the
- `max_allowed_packet`: Maximum network packet size mysqld will accept
- `old_root_password`: Previous root user password
- `php_package_name`: The name of the phpmysql package to install
- `pidfile`: The location mysql will expect the pidfile to be
- `port`: The port mysql listens on
- `purge_conf_dir`: Value fed to recurse and purge parameters of the
/etc/mysql/conf.d resource
- `python_package_name`: The name of the python mysql package to install
- `restart`: Whether to restart mysqld
- `root_group`: Use specified group for root-owned files
- `root_password`: The root MySQL password to use
- `ruby_package_name`: The name of the ruby mysql package to install
- `ruby_package_provider`: The installation suite to use when installing the
- `python_package_name`: The name of the python mysql package to install
- `restart`: Whether to restart mysqld
- `root_group`: Use specified group for root-owned files
- `root_password`: The root MySQL password to use
- `ruby_package_name`: The name of the ruby mysql package to install
- `ruby_package_provider`: The installation suite to use when installing the
ruby package
- `server_package_name`: The name of the server package to install
- `service_name`: The name of the service to start
- `service_provider`: The name of the service provider
- `socket`: The location of the MySQL server socket file
- `ssl_ca`: The location of the SSL CA Cert
- `ssl_cert`: The location of the SSL Certificate to use
- `ssl_key`: The SSL key to use
- `ssl`: Whether or not to enable ssl
- `tmpdir`: The directory MySQL's tmpfiles are stored
- `server_package_name`: The name of the server package to install
- `service_name`: The name of the service to start
- `service_provider`: The name of the service provider
- `socket`: The location of the MySQL server socket file
- `ssl_ca`: The location of the SSL CA Cert
- `ssl_cert`: The location of the SSL Certificate to use
- `ssl_key`: The SSL key to use
- `ssl`: Whether or not to enable ssl
- `tmpdir`: The directory MySQL's tmpfiles are stored
* Deprecate `mysql::package_name` parameter in favor of
`mysql::client_package_name`
* Fix local variable template deprecation
@ -296,10 +326,10 @@ configuration variables.
* Fix travis support (but still messy)
* Fix typos
2013-01-11 - Version 0.6.1
##2013-01-11 - Version 0.6.1
* Fix providers when /root/.my.cnf is absent
2013-01-09 - Version 0.6.0
##2013-01-09 - Version 0.6.0
* Add `mysql::server::config` define for specific config directives
* Add `mysql::php` class for php support
* Add `backupcompress` parameter to `mysql::backup`
@ -316,7 +346,7 @@ configuration variables.
* Fix typos
* Fix lint warnings
2012-08-23 - Version 0.5.0
##2012-08-23 - Version 0.5.0
* Add puppetlabs/stdlib as requirement
* Add validation for mysql privs in provider
* Add `pidfile` parameter to mysql::config
@ -325,122 +355,122 @@ configuration variables.
* Change `bind_address` parameter to be optional in my.cnf template
* Fix quoting root passwords
2012-07-24 - Version 0.4.0
##2012-07-24 - Version 0.4.0
* Fix various bugs regarding database names
* FreeBSD support
* Allow specifying the storage engine
* Add a backup class
* Add a security class to purge default accounts
2012-05-03 - Version 0.3.0
* #14218 Query the database for available privileges
##2012-05-03 - Version 0.3.0
* 14218 Query the database for available privileges
* Add mysql::java class for java connector installation
* Use correct error log location on different distros
* Fix set_mysql_rootpw to properly depend on my.cnf
2012-04-11 - Version 0.2.0
##2012-04-11 - Version 0.2.0
2012-03-19 - William Van Hevelingen <blkperl@cat.pdx.edu>
##2012-03-19 - William Van Hevelingen <blkperl@cat.pdx.edu>
* (#13203) Add ssl support (f7e0ea5)
2012-03-18 - Nan Liu <nan@puppetlabs.com>
##2012-03-18 - Nan Liu <nan@puppetlabs.com>
* Travis ci before script needs success exit code. (0ea463b)
2012-03-18 - Nan Liu <nan@puppetlabs.com>
##2012-03-18 - Nan Liu <nan@puppetlabs.com>
* Fix Puppet 2.6 compilation issues. (9ebbbc4)
2012-03-16 - Nan Liu <nan@puppetlabs.com>
##2012-03-16 - Nan Liu <nan@puppetlabs.com>
* Add travis.ci for testing multiple puppet versions. (33c72ef)
2012-03-15 - William Van Hevelingen <blkperl@cat.pdx.edu>
##2012-03-15 - William Van Hevelingen <blkperl@cat.pdx.edu>
* (#13163) Datadir should be configurable (f353fc6)
2012-03-16 - Nan Liu <nan@puppetlabs.com>
##2012-03-16 - Nan Liu <nan@puppetlabs.com>
* Document create_resources dependency. (558a59c)
2012-03-16 - Nan Liu <nan@puppetlabs.com>
##2012-03-16 - Nan Liu <nan@puppetlabs.com>
* Fix spec test issues related to error message. (eff79b5)
2012-03-16 - Nan Liu <nan@puppetlabs.com>
##2012-03-16 - Nan Liu <nan@puppetlabs.com>
* Fix mysql service on Ubuntu. (72da2c5)
2012-03-16 - Dan Bode <dan@puppetlabs.com>
##2012-03-16 - Dan Bode <dan@puppetlabs.com>
* Add more spec test coverage (55e399d)
2012-03-16 - Nan Liu <nan@puppetlabs.com>
##2012-03-16 - Nan Liu <nan@puppetlabs.com>
* (#11963) Fix spec test due to path changes. (1700349)
2012-03-07 - François Charlier <fcharlier@ploup.net>
##2012-03-07 - François Charlier <fcharlier@ploup.net>
* Add a test to check path for 'mysqld-restart' (b14c7d1)
2012-03-07 - François Charlier <fcharlier@ploup.net>
##2012-03-07 - François Charlier <fcharlier@ploup.net>
* Fix path for 'mysqld-restart' (1a9ae6b)
2012-03-15 - Dan Bode <dan@puppetlabs.com>
##2012-03-15 - Dan Bode <dan@puppetlabs.com>
* Add rspec-puppet tests for mysql::config (907331a)
2012-03-15 - Dan Bode <dan@puppetlabs.com>
##2012-03-15 - Dan Bode <dan@puppetlabs.com>
* Moved class dependency between sever and config to server (da62ad6)
2012-03-14 - Dan Bode <dan@puppetlabs.com>
##2012-03-14 - Dan Bode <dan@puppetlabs.com>
* Notify mysql restart from set_mysql_rootpw exec (0832a2c)
2012-03-15 - Nan Liu <nan@puppetlabs.com>
##2012-03-15 - Nan Liu <nan@puppetlabs.com>
* Add documentation related to osfamily fact. (8265d28)
2012-03-14 - Dan Bode <dan@puppetlabs.com>
##2012-03-14 - Dan Bode <dan@puppetlabs.com>
* Mention osfamily value in failure message (e472d3b)
2012-03-14 - Dan Bode <dan@puppetlabs.com>
##2012-03-14 - Dan Bode <dan@puppetlabs.com>
* Fix bug when querying for all database users (015490c)
2012-02-09 - Nan Liu <nan@puppetlabs.com>
##2012-02-09 - Nan Liu <nan@puppetlabs.com>
* Major refactor of mysql module. (b1f90fd)
2012-01-11 - Justin Ellison <justin.ellison@buckle.com>
##2012-01-11 - Justin Ellison <justin.ellison@buckle.com>
* Ruby and Python's MySQL libraries are named differently on different distros. (1e926b4)
2012-01-11 - Justin Ellison <justin.ellison@buckle.com>
##2012-01-11 - Justin Ellison <justin.ellison@buckle.com>
* Per @ghoneycutt, we should fail explicitly and explain why. (09af083)
2012-01-11 - Justin Ellison <justin.ellison@buckle.com>
##2012-01-11 - Justin Ellison <justin.ellison@buckle.com>
* Removing duplicate declaration (7513d03)
2012-01-10 - Justin Ellison <justin.ellison@buckle.com>
##2012-01-10 - Justin Ellison <justin.ellison@buckle.com>
* Use socket value from params class instead of hardcoding. (663e97c)
2012-01-10 - Justin Ellison <justin.ellison@buckle.com>
##2012-01-10 - Justin Ellison <justin.ellison@buckle.com>
* Instead of hardcoding the config file target, pull it from mysql::params (031a47d)
2012-01-10 - Justin Ellison <justin.ellison@buckle.com>
##2012-01-10 - Justin Ellison <justin.ellison@buckle.com>
* Moved $socket to within the case to toggle between distros. Added a $config_file variable to allow per-distro config file destinations. (360eacd)
2012-01-10 - Justin Ellison <justin.ellison@buckle.com>
##2012-01-10 - Justin Ellison <justin.ellison@buckle.com>
* Pretty sure this is a bug, 99% of Linux distros out there won't ever hit the default. (3462e6b)
2012-02-09 - William Van Hevelingen <blkperl@cat.pdx.edu>
##2012-02-09 - William Van Hevelingen <blkperl@cat.pdx.edu>
* Changed the README to use markdown (3b7dfeb)
2012-02-04 - Daniel Black <grooverdan@users.sourceforge.net>
##2012-02-04 - Daniel Black <grooverdan@users.sourceforge.net>
* (#12412) mysqltuner.pl update (b809e6f)
2011-11-17 - Matthias Pigulla <mp@webfactory.de>
##2011-11-17 - Matthias Pigulla <mp@webfactory.de>
* (#11363) Add two missing privileges to grant: event_priv, trigger_priv (d15c9d1)
2011-12-20 - Jeff McCune <jeff@puppetlabs.com>
##2011-12-20 - Jeff McCune <jeff@puppetlabs.com>
* (minor) Fixup typos in Modulefile metadata (a0ed6a1)
2011-12-19 - Carl Caum <carl@carlcaum.com>
##2011-12-19 - Carl Caum <carl@carlcaum.com>
* Only notify Exec to import sql if sql is given (0783c74)
2011-12-19 - Carl Caum <carl@carlcaum.com>
##2011-12-19 - Carl Caum <carl@carlcaum.com>
* (#11508) Only load sql_scripts on DB creation (e3b9fd9)
2011-12-13 - Justin Ellison <justin.ellison@buckle.com>
##2011-12-13 - Justin Ellison <justin.ellison@buckle.com>
* Require not needed due to implicit dependencies (3058feb)
2011-12-13 - Justin Ellison <justin.ellison@buckle.com>
##2011-12-13 - Justin Ellison <justin.ellison@buckle.com>
* Bug #11375: puppetlabs-mysql fails on CentOS/RHEL (a557b8d)
2011-06-03 - Dan Bode <dan@puppetlabs.com> - 0.0.1
##2011-06-03 - Dan Bode <dan@puppetlabs.com> - 0.0.1
* initial commit

2
Modulefile
View file

@ -1,5 +1,5 @@
name 'puppetlabs-mysql'
version '2.2.1'
version '2.2.3'
source 'git://github.com/puppetlabs/puppetlabs-mysql.git'
author 'Puppet Labs'
license 'Apache 2.0'

102
metadata.json
View file

@ -1,30 +1,76 @@
{
"name": "puppetlabs/mysql",
"version": "2.2.1",
"summary": "Manage MySQL, includes types/providers",
"source": "git@github.com/puppetlabs/puppetlabs-mysql.git",
"project_page": "http://github.com/puppetlabs/puppetlabs-mysql",
"author": "Puppet Labs",
"license": "Apache-2.0",
"operatingsystem_support": [
"RedHat",
"OpenSUSE",
"SLES",
"SLED",
"Debian",
"Ubuntu"
],
"puppet_version": [
"2.7",
"3.0",
"3.1",
"3.2",
"3.3"
],
"dependencies": [
{
"name": "puppetlabs/stdlib",
"version_requirement": ">= 2.2.1"
}
]
"operatingsystem_support": [
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"5",
"6"
]
},
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"5",
"6"
]
},
{
"operatingsystem": "OracleLinux",
"operatingsystemrelease": [
"5",
"6"
]
},
{
"operatingsystem": "Scientific",
"operatingsystemrelease": [
"5",
"6"
]
},
{
"operatingsystem": "SLES",
"operatingsystemrelease": [
"11 SP1"
]
},
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"6",
"7"
]
},
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"10.04",
"12.04"
]
}
],
"requirements": [
{
"name": "pe",
"version_requirement": "3.2.x"
},
{
"name": "puppet",
"version_requirement": "3.x"
}
],
"name": "puppetlabs-mysql",
"version": "2.2.3",
"source": "git://github.com/puppetlabs/puppetlabs-mysql.git",
"author": "Puppet Labs",
"license": "Apache 2.0",
"summary": "Mysql module",
"description": "Mysql module",
"project_page": "http://github.com/puppetlabs/puppetlabs-mysql",
"dependencies": [
{
"name": "puppetlabs/stdlib",
"version_requirement": ">= 3.2.0"
}
]
}

4
spec/acceptance/mysql_server_config_spec.rb
View file

@ -15,7 +15,7 @@ describe 'config location', :unless => UNSUPPORTED_PLATFORMS.include?(fact('oper
end
end
describe 'manage_config_file' do
describe 'manage_config_file', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
it 'wont reset the location of my.cnf' do
pp = <<-EOS
class { 'mysql::server':
@ -36,7 +36,7 @@ describe 'manage_config_file' do
end
end
describe 'resets' do
describe 'resets', :unless => UNSUPPORTED_PLATFORMS.include?(fact('operatingsystem')) do
it 'cleans up' do
pp = <<-EOS
class { 'mysql::server': }

10
spec/acceptance/nodesets/centos-64-x64.yml
View file

@ -1,10 +0,0 @@
HOSTS:
centos-64-x64:
roles:
- master
platform: el-6-x86_64
box : centos-64-x64-vbox4210-nocm
box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
hypervisor : vagrant
CONFIG:
type: foss

1
spec/acceptance/nodesets/default.yml
View file

@ -1 +0,0 @@
centos-64-x64.yml

10
spec/acceptance/nodesets/default.yml Normal file
View file

@ -0,0 +1,10 @@
HOSTS:
centos-64-x64:
roles:
- master
platform: el-6-x86_64
box : centos-64-x64-vbox4210-nocm
box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
hypervisor : vagrant
CONFIG:
type: foss

2
spec/spec_helper_acceptance.rb
View file

@ -41,7 +41,7 @@ RSpec.configure do |c|
end
end
shell('/bin/touch /etc/puppet/hiera.yaml')
shell("/bin/touch #{default['puppetpath']}/hiera.yaml")
shell('puppet module install puppetlabs-stdlib --version 3.2.0', { :acceptable_exit_codes => [0,1] })
end
end