Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update with modulesync
  • Loading branch information
mcanevet committed Jan 29, 2015
1 parent 0854aad commit 930bf24
Show file tree
Hide file tree
Showing 8 changed files with 87 additions and 13 deletions.
16 changes: 3 additions & 13 deletions .travis.yml
Expand Up @@ -13,18 +13,8 @@ matrix:
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
allow_failures:
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
notifications:
email: false
deploy:
provider: puppetforge
user: camptocamp
password:
secure: ""
on:
tags: true
# all_branches is required to use tags
all_branches: true
# Only publish if our main Ruby target builds
rvm: 1.9.3
12 changes: 12 additions & 0 deletions spec/acceptance/nodesets/centos-7-x86_64-docker.yml
@@ -0,0 +1,12 @@
HOSTS:
centos-7-x86_64:
default_apply_opts:
strict_variables:
platform: el-7-x86_64
hypervisor : docker
image: centos:7
# This stops the image from being deleted on completion, speeding up the process.
docker_preserve_image: true
CONFIG:
type: foss
log_level: debug
13 changes: 13 additions & 0 deletions spec/acceptance/nodesets/centos-7-x86_64-openstack.yml
@@ -0,0 +1,13 @@
HOSTS:
centos-7-x86_64:
default_apply_opts:
strict_variables:
platform: el-7-x86_64
hypervisor : openstack
flavor: m1.small
image: centos-7-x86_64-genericcloud-20140929_01
user: centos
CONFIG:
type: foss
log_level: debug
openstack_network: default
10 changes: 10 additions & 0 deletions spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
@@ -0,0 +1,10 @@
HOSTS:
centos-7-x86_64:
default_apply_opts:
strict_variables:
platform: el-7-x86_64
hypervisor : vagrant
box : puppetlabs/centos-6.5-64-nocm
CONFIG:
type: foss
log_level: debug
12 changes: 12 additions & 0 deletions spec/acceptance/nodesets/debian-7-x86_64-docker.yml
@@ -0,0 +1,12 @@
HOSTS:
debian-7-x86_64:
default_apply_opts:
strict_variables:
platform: debian-7-amd64
hypervisor : docker
image: debian:7.5
# This stops the image from being deleted on completion, speeding up the process.
docker_preserve_image: true
CONFIG:
type: foss
log_level: debug
13 changes: 13 additions & 0 deletions spec/acceptance/nodesets/debian-7-x86_64-openstack.yml
@@ -0,0 +1,13 @@
HOSTS:
debian-7-x86_64:
default_apply_opts:
strict_variables:
platform: debian-7-amd64
hypervisor : openstack
flavor: m1.small
image: debian-7-amd64-20141121
user: debian
CONFIG:
type: foss
log_level: debug
openstack_network: default
11 changes: 11 additions & 0 deletions spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
@@ -0,0 +1,11 @@
HOSTS:
debian-7-x86_64:
default_apply_opts:
strict_variables:
platform: debian-7-amd64
hypervisor : vagrant
box : debian-73-x64-virtualbox-nocm
box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-nocm.box
CONFIG:
type: foss
log_level: debug
13 changes: 13 additions & 0 deletions spec/acceptance/nodesets/debian-8-x86_64-openstack.yml
@@ -0,0 +1,13 @@
HOSTS:
debian-8-x86_64:
default_apply_opts:
strict_variables:
platform: debian-8-amd64
hypervisor : openstack
flavor: m1.small
image: debian-8-amd64-20141121
user: debian
CONFIG:
type: foss
openstack_network: default
log_level: debug

0 comments on commit 930bf24

Please sign in to comment.