Skip to content

Commit

Permalink
Merge pull request #570 from dhoppe/modulesync
Browse files Browse the repository at this point in the history
Update based on voxpupuli/modulesync_config 0.14.1
  • Loading branch information
bastelfreak committed Oct 20, 2016
2 parents c31ec50 + f43caf2 commit ed996d4
Show file tree
Hide file tree
Showing 20 changed files with 223 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
modulesync_config_version: '0.13.3'
modulesync_config_version: '0.14.1'
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ group :test do
gem 'rubocop-rspec', '~> 1.6', :require => false if RUBY_VERSION >= '2.3.0'
gem 'json_pure', '<= 2.0.1', :require => false if RUBY_VERSION < '2.0.0'
gem 'mocha', '>= 1.2.1', :require => false
gem 'coveralls', :require => false if RUBY_VERSION >= '2.0.0'
end

group :development do
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,4 +1,7 @@
---
# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
HOSTS:
centos-511-x64:
roles:
Expand Down
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,4 +1,7 @@
---
# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
HOSTS:
centos-66-x64:
roles:
Expand Down
3 changes: 3 additions & 0 deletions spec/acceptance/nodesets/centos-66-x64.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
---
# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
HOSTS:
centos-66-x64:
roles:
Expand Down
3 changes: 3 additions & 0 deletions spec/acceptance/nodesets/centos-72-x64.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
---
# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
HOSTS:
centos-72-x64:
roles:
Expand Down
3 changes: 3 additions & 0 deletions spec/acceptance/nodesets/debian-78-x64.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
---
# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
HOSTS:
debian-78-x64:
roles:
Expand Down
3 changes: 3 additions & 0 deletions spec/acceptance/nodesets/debian-82-x64.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
---
# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
HOSTS:
debian-82-x64:
roles:
Expand Down
22 changes: 22 additions & 0 deletions spec/acceptance/nodesets/docker/centos-5.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
HOSTS:
centos-5-x64:
default_apply_opts:
order: random
strict_variables:
platform: el-5-x86_64
hypervisor : docker
image: tianon/centos:5.10
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'yum install -y crontabs tar wget which'
- 'sed -i -e "/mingetty/d" /etc/inittab'
CONFIG:
type: aio
log_level: debug
...
# vim: syntax=yaml
23 changes: 23 additions & 0 deletions spec/acceptance/nodesets/docker/centos-6.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
---
# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
HOSTS:
centos-6-x64:
default_apply_opts:
order: random
strict_variables:
platform: el-6-x86_64
hypervisor : docker
image: centos:6
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'rm -rf /var/run/network/*'
- 'yum install -y crontabs tar wget'
- 'rm /etc/init/tty.conf'
CONFIG:
type: aio
log_level: debug
...
# vim: syntax=yaml
21 changes: 21 additions & 0 deletions spec/acceptance/nodesets/docker/centos-7.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
HOSTS:
centos-7-x64:
default_apply_opts:
order: random
strict_variables:
platform: el-7-x86_64
hypervisor : docker
image: centos:7
docker_preserve_image: true
docker_cmd: '["/usr/sbin/init"]'
docker_image_commands:
- 'yum install -y crontabs tar wget iproute'
CONFIG:
type: aio
log_level: debug
...
# vim: syntax=yaml
21 changes: 21 additions & 0 deletions spec/acceptance/nodesets/docker/debian-7.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
HOSTS:
debian-7-x64:
default_apply_opts:
order: random
strict_variables:
platform: debian-7-amd64
hypervisor : docker
image: debian:7
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'apt-get install -y cron locales-all net-tools wget'
CONFIG:
type: aio
log_level: debug
...
# vim: syntax=yaml
22 changes: 22 additions & 0 deletions spec/acceptance/nodesets/docker/debian-8.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
HOSTS:
debian-8-x64:
default_apply_opts:
order: random
strict_variables:
platform: debian-8-amd64
hypervisor : docker
image: debian:8
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'apt-get install -y cron locales-all net-tools wget'
- 'rm -f /usr/sbin/policy-rc.d'
CONFIG:
type: aio
log_level: debug
...
# vim: syntax=yaml
22 changes: 22 additions & 0 deletions spec/acceptance/nodesets/docker/ubuntu-12.04.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
HOSTS:
ubuntu-1204-x64:
default_apply_opts:
order: random
strict_variables:
platform: ubuntu-12.04-amd64
hypervisor : docker
image: ubuntu:12.04
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'apt-get install -y net-tools wget'
- 'locale-gen en_US.UTF-8'
CONFIG:
type: aio
log_level: debug
...
# vim: syntax=yaml
24 changes: 24 additions & 0 deletions spec/acceptance/nodesets/docker/ubuntu-14.04.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
HOSTS:
ubuntu-1404-x64:
default_apply_opts:
order: random
strict_variables:
platform: ubuntu-14.04-amd64
hypervisor : docker
image: ubuntu:14.04
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'rm /usr/sbin/policy-rc.d'
- 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl'
- 'apt-get install -y net-tools wget'
- 'locale-gen en_US.UTF-8'
CONFIG:
type: aio
log_level: debug
...
# vim: syntax=yaml
22 changes: 22 additions & 0 deletions spec/acceptance/nodesets/docker/ubuntu-16.04.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
HOSTS:
ubuntu-1604-x64:
default_apply_opts:
order: random
strict_variables:
platform: ubuntu-16.04-amd64
hypervisor : docker
image: ubuntu:16.04
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'apt-get install -y net-tools wget'
- 'locale-gen en_US.UTF-8'
CONFIG:
type: aio
log_level: debug
...
# 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,4 +1,7 @@
---
# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
HOSTS:
ubuntu-server-1204-x64:
roles:
Expand Down
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,4 +1,7 @@
---
# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
HOSTS:
ubuntu-server-1404-x64:
roles:
Expand Down
15 changes: 15 additions & 0 deletions spec/acceptance/nodesets/ubuntu-server-1604-x64.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config
HOSTS:
ubuntu-server-1604-x64:
roles:
- master
platform: ubuntu-16.04-amd64
box: puppetlabs/ubuntu-16.04-64-nocm
hypervisor: vagrant
CONFIG:
type: foss
...
# vim: syntax=yaml
5 changes: 5 additions & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
require 'rspec-puppet-facts'
include RspecPuppetFacts

unless RUBY_VERSION =~ %r{^1.9}
require 'coveralls'
Coveralls.wear!
end

RSpec.configure do |c|
default_facts = {
puppetversion: Puppet.version,
Expand Down

0 comments on commit ed996d4

Please sign in to comment.