Skip to content
Open
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
26 changes: 3 additions & 23 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,4 @@
---
language: ruby
bundler_args: --without development
before_install: rm Gemfile.lock || true
matrix:
fast_finish: true
include:
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER=yes
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.1.6
env: PUPPET_GEM_VERSION="~> 4.1.0" STRICT_VARIABLES=yes
- rvm: 2.1.6
env: PUPPET_GEM_VERSION="~> 4.2.0" STRICT_VARIABLES=yes
- rvm: 2.1.6
env: PUPPET_GEM_VERSION="~> 4.3.0" STRICT_VARIABLES=yes
- rvm: 2.1.6
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES=yes
script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
notifications:
email: false
rvm:
- 2.4.1
dist: trusty
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Puppet - Rancher
================

[![Build Status](https://travis-ci.org/nickschuch/puppet-rancher.svg?branch=master)](https://travis-ci.org/nickschuch/puppet-rancher)
[![Build Status](https://travis-ci.org/andrewpsp/puppet-rancher.svg?branch=master)](https://travis-ci.org/andrewpsp/puppet-rancher)

## Overview

Expand Down
4 changes: 2 additions & 2 deletions manifests/management.pp
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
}

docker::run { 'rancher/server':
image => 'rancher/server',
image => 'rancher/server:stable',
ports => [ "${rancher_manager_port}:8080" ],
require => Docker::Image['rancher/server'],
require => Docker::Image['rancher/server:stable'],
}
}
17 changes: 17 additions & 0 deletions puppet.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#Avoid absolute paths and keep puppet-releated files together
#increased mobility
enviromentpath = $codedir/override_environments:$codedir/environments


#modules in this path is avalible to all enviromnets
basemodulepath = $codedir/modules

#allow each environment to use its own manifest
default_manifest = ./manifests

#explicitly set to avoid serving catalogs with potentially wrong contents
#promotes explicit environment.conf set
disable_per_enviroment_manifest = false

#for best performance - enviroments refreshed on updated code deploy
enviornment_timeout = unlimited