Skip to content

Commit

Permalink
Merge pull request #22 from jordiprats/master
Browse files Browse the repository at this point in the history
ubuntu16 support
  • Loading branch information
jordiprats authored Feb 1, 2017
2 parents cb3219b + 7af043b commit ddc8169
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 3 deletions.
5 changes: 5 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,8 @@ matrix:
dist: trusty
bundler_args:
script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
- rvm: default
env: BEAKER_set="ubuntu16-docker"
dist: trusty
bundler_args:
script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
2 changes: 1 addition & 1 deletion manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
{
case $::operatingsystemrelease
{
/^14.*$/:
/^1[46].*$/:
{
$sysctlreload='sysctl -e --system'
}
Expand Down
4 changes: 2 additions & 2 deletions metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eyp-sysctl",
"version": "0.2.16",
"version": "0.2.17",
"author": "eyp",
"summary": "configure and manage sysctl",
"license": "Apache-2.0",
Expand Down Expand Up @@ -31,7 +31,7 @@
},
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [ "14.04" ]
"operatingsystemrelease": [ "14.04", "16.04" ]
}
]
}
15 changes: 15 additions & 0 deletions spec/acceptance/nodesets/ubuntu16-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
HOSTS:
ubuntu-1604-x64:
default_apply_opts:
order: random
strict_variables:
platform: ubuntu-16.04-amd64
hypervisor : docker
image: ubuntu:16.04
docker_cmd: '["/sbin/init"]'
docker_preserve_image: true
docker_image_commands:
- 'apt-get install gcc make tar wget -y'
CONFIG:
type: foss
log_level: debug

0 comments on commit ddc8169

Please sign in to comment.