Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Modulesync + Release 2.3.2 #227

Merged
merged 5 commits into from
May 21, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -494,5 +494,11 @@ Style/ClosingParenthesisIndentation:
Enabled: false

# RSpec

# We don't use rspec in this way
RSpec/DescribeClass:
Enabled: False

# Example length is not necessarily an indicator of code quality
RSpec/ExampleLength:
Enabled: False
2 changes: 1 addition & 1 deletion .sync.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
.travis.yml:
secure: "ijm7hKPYWr1eg7151g5oK6MzZL4ojrgWjKlxgoBHXAdXdY88opMgvixfSJK5IMUbtanPfWRkqqABx+MYO78nfQBWDlghUzZ8sQXFeO2Ie0PgWl4nFV0kKWz+ejVaZC4dKSZlWha5pO1ek+sx7KnjIBZY82OXs/GXbjwhHx6d56YugXLuCyvfFxC7mXC9wF58bPwcYRCBSZt9CRl0OMBAFybxjdwsFMloRRhdz7f3hhlqF8Nrs1sxG1HhgiMcnrZqovNfb3Tw9K1RPYATazXxQrjcI7YHvJx0AvtHFUsn+/A0GtpKUuuPbaVdkYgE1Tye0AsAcey6RW4xhJywZglKrzDk7vfyUiU5CObeLh4/dhub3k111rDPL8v6v9t40fteduJoFLziHotQwdl37UALL7PwWZY5HuJvaBqHY2LsGs/ptGMB9ZCzxA85jfDw8lrZQ7P97SAoC34Ihs8D6vkKT9HUKHIXh19O5AAa70jReru0ej179IBjvs8m9nDwDNdY3sIsdhUU8WQ3BftDF6M8OzvgyLKDvjSs1Izag+Asl2Ze7RAQfQ2RvbfkDm9KEFnDQtXtzF4Cu1Ed6io2j1zI71JFQpIf6zb1qeNrhqulbJ15owGkQmHBgD8K+bDd1CCU4kA26axypV00XDsjfwdtFHgtUO3AlUVUim0QTMk9ATc="
spec_helper.rb:
spec/spec_helper.rb:
spec_overrides: "require 'spec_helper_methods'"
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ script:
matrix:
fast_finish: true
include:
- rvm: jruby-19mode
- rvm: 1.9.3
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
- rvm: jruby-19mode
env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
- rvm: 1.9.3
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" FUTURE_PARSER="yes" CHECK=test
- rvm: 2.1
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
- rvm: 2.1
Expand Down
11 changes: 9 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
## 2016-5-19 Release 2.3.1
## 2016-05-2 Release 2.3.2

* Maintenance: modulesync with voxpupuli defaults
* removed broken jruby tests which broke deployment to the forge


## 2016-05-19 Release 2.3.1

* Fix: correct path to DB schema on all RHEL systems
* Fix: don't deal with selinux on non RHEL systems
Expand All @@ -7,7 +13,8 @@
* enhance code coverage
* bump required stdlib version from 4.1.0 to 4.4.0

## 2016-5-08 Release 2.3.0

## 2016-05-08 Release 2.3.0

* fix typo/missing code in userparameters
* modulesync with voxpupuli defaults #214
Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,4 @@ can use `BEAKER_DESTROY=no` and `BEAKER_PROVISION=no`. On the first run you will
at least need `BEAKER_PROVISION` set to yes (the default). The Vagrantfile
for the created virtual machines will be in `.vagrant/beaker_vagrant_fies`.

# vim: syntax=markdown
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,4 @@ end
ENV['PUPPET_VERSION'].nil? ? puppetversion = '~> 4.0' : puppetversion = ENV['PUPPET_VERSION'].to_s
gem 'puppet', puppetversion, :require => false, :groups => [:test]

# vim:ft=ruby
# vim: syntax=ruby
1 change: 1 addition & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,4 @@ task test: [
:syntax,
:spec,
]
# vim: syntax=ruby
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppet-zabbix",
"version": "2.3.2-rc0",
"version": "2.3.2",
"summary": "Installing and maintaining Zabbix. Will install server, proxy, java-gateway and agent on RedHat/Debian/Ubuntu (Incl. exported resources).",
"author": "Voxpupuli",
"dependencies": [
Expand Down
3 changes: 3 additions & 0 deletions spec/acceptance/nodesets/centos-511-x64.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
HOSTS:
centos-511-x64:
roles:
Expand All @@ -7,3 +8,5 @@ HOSTS:
hypervisor: vagrant
CONFIG:
type: foss
...
# vim: syntax=yaml
3 changes: 3 additions & 0 deletions spec/acceptance/nodesets/centos-66-x64-pe.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
HOSTS:
centos-66-x64:
roles:
Expand All @@ -9,3 +10,5 @@ HOSTS:
hypervisor: vagrant
CONFIG:
type: pe
...
# vim: syntax=yaml
3 changes: 3 additions & 0 deletions spec/acceptance/nodesets/centos-66-x64.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
HOSTS:
centos-66-x64:
roles:
Expand All @@ -7,3 +8,5 @@ HOSTS:
hypervisor: vagrant
CONFIG:
type: foss
...
# vim: syntax=yaml
3 changes: 3 additions & 0 deletions spec/acceptance/nodesets/centos-72-x64.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
HOSTS:
centos-72-x64:
roles:
Expand All @@ -7,3 +8,5 @@ HOSTS:
hypervisor: vagrant
CONFIG:
type: foss
...
# vim: syntax=yaml
3 changes: 3 additions & 0 deletions spec/acceptance/nodesets/debian-78-x64.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
HOSTS:
debian-78-x64:
roles:
Expand All @@ -7,3 +8,5 @@ HOSTS:
hypervisor: vagrant
CONFIG:
type: foss
...
# vim: syntax=yaml
3 changes: 3 additions & 0 deletions spec/acceptance/nodesets/debian-82-x64.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
HOSTS:
debian-82-x64:
roles:
Expand All @@ -7,3 +8,5 @@ HOSTS:
hypervisor: vagrant
CONFIG:
type: foss
...
# vim: syntax=yaml
3 changes: 3 additions & 0 deletions spec/acceptance/nodesets/ubuntu-server-1204-x64.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
HOSTS:
ubuntu-server-1204-x64:
roles:
Expand All @@ -7,3 +8,5 @@ HOSTS:
hypervisor: vagrant
CONFIG:
type: foss
...
# vim: syntax=yaml
3 changes: 3 additions & 0 deletions spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
HOSTS:
ubuntu-server-1404-x64:
roles:
Expand All @@ -7,3 +8,5 @@ HOSTS:
hypervisor: vagrant
CONFIG:
type: foss
...
# vim: syntax=yaml
1 change: 1 addition & 0 deletions spec/classes/coverage_spec.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
require 'rspec-puppet'

at_exit { RSpec::Puppet::Coverage.report! }
# vim: syntax=ruby
3 changes: 2 additions & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
require 'puppetlabs_spec_helper/module_spec_helper'
require 'rspec-puppet-facts'
require 'spec_helper_methods'
include RspecPuppetFacts
require 'spec_helper_methods'
# vim: syntax=ruby