Skip to content

Commit

Permalink
Perparing for 1.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
craigwatson committed Sep 24, 2014
1 parent 13bea08 commit fbb25f4
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ CHANGELOG
1.0.0
-----

TBD
2014-09-24

Major release

* Module-wide change: This and all future versions of the module are now distributed under the Apache Licence v2.0! Previous versions are still licensed under the GNU General Public Licence v3.
* Module-wide changes -- This and all future versions of the module are now distributed under the Apache Licence v2.0! Previous versions are still licensed under the GNU General Public Licence v3.
-- This module is now dependant on [PuppetLabs' stdlib module](https://github.come/puppetlabs/puppetlabs-stdlib). Please make sure this module is available within your Puppet codebase.

* vmwaretools fact -- Fixes vmwaretools fact detection for failed tools installs - thanks [Markus Frosch](https://github.com/lazyfrosch) for [pull request #49](https://github.com/craigwatson/puppet-vmwaretools/pull/49)!
* vmwaretools -- open-vm-tools is now purged rather than just absent thanks [Markus Frosch](https://github.com/lazyfrosch) for [pull request #49](https://github.com/craigwatson/puppet-vmwaretools/pull/49)!
-- We now use PuppetLabs' [stdlib](https://github.come/puppetlabs/puppetlabs-stdlib) to validate parameters passed to the module

0.4.3
-----
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,9 @@ Upgrading of currently installed VMware Tools packages is also supported - the m

###Setup Requirements

* Perl must be installed on the target systems in order to run the VMware Tools installer.
* Perl must be installed on the target systems in order to run the VMware Tools installer - installation of Perl is not handled by the module.
* Pluginsync must be enabled, due to the `vmwaretools_version` custom fact distributed with this module. If the module cannot access the fact, the Puppet run will fail.
* As of version 1.0.0, the module requires the [PuppetLabs stdlib module](https://github.come/puppetlabs/puppetlabs-stdlib) module to be available within your Puppet code.

###Beginning with puppet-vmwaretools

Expand Down
12 changes: 8 additions & 4 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,15 @@ begin
rescue LoadError
end

PuppetLint.configuration.relative = true
PuppetLint.configuration.send("disable_80chars")
PuppetLint.configuration.send('disable_quoted_booleans')
PuppetLint.configuration.log_format = "%{path}:%{linenumber}:%{check}:%{KIND}:%{message}"
PuppetLint.configuration.fail_on_warnings = true
PuppetLint.configuration.relative
PuppetLint.configuration.send('disable_80chars')
PuppetLint.configuration.send('disable_class_inherits_from_params_class')
PuppetLint.configuration.send('disable_class_parameter_defaults')
PuppetLint.configuration.send('disable_documentation')
PuppetLint.configuration.send('disable_single_quote_string_with_variables')
PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
PuppetLint.configuration.log_format = "%{path}:%{linenumber}:%{check}:%{KIND}:%{message}"

# Forsake support for Puppet 2.6.2 for the benefit of cleaner code.
# http://puppet-lint.com/checks/class_parameter_defaults/
Expand Down
4 changes: 2 additions & 2 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
# https://tickets.puppetlabs.com/browse/FACT-151
# https://projects.puppetlabs.com/issues/3704

if $::is_virtual == 'true' and $::virtual == 'vmware' and $::kernel == 'Linux' {
if $::is_virtual == true and $::virtual == 'vmware' and $::kernel == 'Linux' {

if $::vmwaretools_version == undef {
fail 'vmwaretools_version fact not present, please check your pluginsync configuraton.'
Expand Down Expand Up @@ -143,7 +143,7 @@
if $timesync != undef {
include vmwaretools::timesync
}
} elsif $fail_on_non_vmware == true and ($::is_virtual == 'false' or $::virtual != 'vmware') {
} elsif $fail_on_non_vmware == true and ($::is_virtual == false or $::virtual != 'vmware') {
fail 'Not a VMware platform.'
}
}

0 comments on commit fbb25f4

Please sign in to comment.