Skip to content

Commit 7399e6f

Browse files
authored
Merge pull request voxpupuli#48 from voxpupuli/modulesync
modulesync 0.16.7
2 parents 877084d + 7db43af commit 7399e6f

File tree

7 files changed

+55
-5
lines changed

7 files changed

+55
-5
lines changed

.msync.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
modulesync_config_version: '0.16.6'
1+
modulesync_config_version: '0.16.7'

.rubocop.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -510,3 +510,11 @@ RSpec/ExampleLength:
510510

511511
RSpec/NamedSubject:
512512
Enabled: False
513+
514+
# disabled for now since they cause a lot of issues
515+
# these issues aren't easy to fix
516+
RSpec/RepeatedDescription:
517+
Enabled: False
518+
519+
RSpec/NestedGroups:
520+
Enabled: False

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ matrix:
3131
env: PUPPET_VERSION="~> 4.0" CHECK=rubocop
3232
- rvm: 2.3.3
3333
env: PUPPET_VERSION="~> 4.0" CHECK=test
34-
- rvm: 2.4.0-rc1
34+
- rvm: 2.4.0
3535
env: PUPPET_VERSION="~> 4.0" CHECK=test
3636
allow_failures:
37-
- rvm: 2.4.0-rc1
37+
- rvm: 2.4.0
3838
branches:
3939
only:
4040
- master

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ group :test do
2525
gem 'metadata-json-lint', :require => false
2626
gem 'puppet-blacksmith', :require => false
2727
gem 'voxpupuli-release', :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem.git'
28-
gem 'puppet-strings', '~> 0.99.0', :require => false
29-
gem 'rubocop-rspec', '~> 1.6', :require => false if RUBY_VERSION >= '2.3.0'
28+
gem 'puppet-strings', '~> 1.0.0', :require => false
29+
gem 'rubocop-rspec', '~> 1.9.0', :require => false if RUBY_VERSION >= '2.3.0'
3030
gem 'json_pure', '<= 2.0.1', :require => false if RUBY_VERSION < '2.0.0'
3131
gem 'mocha', '>= 1.2.1', :require => false
3232
gem 'coveralls', :require => false if RUBY_VERSION >= '2.0.0'
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
# This file is managed via modulesync
3+
# https://github.com/voxpupuli/modulesync
4+
# https://github.com/voxpupuli/modulesync_config
5+
HOSTS:
6+
fedora-24-x64:
7+
roles:
8+
- master
9+
platform: fedora-24-x86_64
10+
box: fedora/24-cloud-base
11+
hypervisor: vagrant
12+
CONFIG:
13+
type: aio
14+
...
15+
# vim: syntax=yaml
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
# This file is managed via modulesync
3+
# https://github.com/voxpupuli/modulesync
4+
# https://github.com/voxpupuli/modulesync_config
5+
#
6+
# platform is fedora 24 because there is no
7+
# puppet-agent for fedora 25 by 2016-12-30
8+
HOSTS:
9+
fedora-25-x64:
10+
roles:
11+
- master
12+
platform: fedora-24-x86_64
13+
box: fedora/25-cloud-base
14+
hypervisor: vagrant
15+
CONFIG:
16+
type: aio
17+
...
18+
# vim: syntax=yaml

spec/default_facts.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
# This file is managed via modulesync
2+
# https://github.com/voxpupuli/modulesync
3+
# https://github.com/voxpupuli/modulesync_config
4+
#
5+
# use default_module_facts.yaml for module specific
6+
# facts.
7+
#
8+
# Hint if using with rspec-puppet-facts ("on_supported_os.each"):
9+
# if a same named fact exists in facterdb it will be overridden.
110
---
211
concat_basedir: "/tmp"
312
ipaddress: "172.16.254.254"

0 commit comments

Comments
 (0)