Commit 9e881cf0 authored by Mickaël Canévet's avatar Mickaël Canévet
Browse files

Update with modulesync

parent 2cbc9ef4

.travis.yml

+1 −0
Changes for .travis.yml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ matrix: 
    env: PUPPET_GEM_VERSION="~> 3.0"

  - rvm: 2.0.0

    env: PUPPET_GEM_VERSION="~> 3.0"

  allow_failures:

    - rvm: 2.0.0

      env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"

notifications:

spec/acceptance/nodesets/centos-7-x86_64-docker.yml

0 → 100644
+12 −0
Changes for spec/acceptance/nodesets/centos-7-x86_64-docker.yml: 12 added lines, 0 removed lines.
Original line number Diff line number Diff line 
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

spec/acceptance/nodesets/centos-7-x86_64-openstack.yml

0 → 100644
+13 −0
Changes for spec/acceptance/nodesets/centos-7-x86_64-openstack.yml: 13 added lines, 0 removed lines.
Original line number Diff line number Diff line 
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

spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml

0 → 100644
+10 −0
Changes for spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line 
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

spec/acceptance/nodesets/debian-7-x86_64-docker.yml

0 → 100644
+12 −0
Changes for spec/acceptance/nodesets/debian-7-x86_64-docker.yml: 12 added lines, 0 removed lines.
Original line number Diff line number Diff line 
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