aboutsummaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorMickaël Canévet <mickael.canevet@camptocamp.com>2015-03-10 17:22:26 +0100
committerMickaël Canévet <mickael.canevet@camptocamp.com>2015-03-10 17:22:26 +0100
commitdf5db9545d6c4558769be1268f6ae06fe5906712 (patch)
treeddd88ba9fa2eb6856f144053faa777b29e7d2add /spec
parentd5ff588392bc76c0a98c8be988d332dc626f0748 (diff)
downloadpuppet-dhcp-df5db9545d6c4558769be1268f6ae06fe5906712.tar.gz
puppet-dhcp-df5db9545d6c4558769be1268f6ae06fe5906712.tar.bz2
[skip-ci] Update with modulesync
Diffstat (limited to 'spec')
-rw-r--r--spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml2
-rw-r--r--spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml2
-rw-r--r--spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml3
-rw-r--r--spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml10
4 files changed, 13 insertions, 4 deletions
diff --git a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
index 6f02769..fe0f83b 100644
--- a/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/centos-7-x86_64-vagrant.yml
@@ -4,7 +4,7 @@ HOSTS:
strict_variables:
platform: el-7-x86_64
hypervisor : vagrant
- box : camptocamp/centos-7-x86_64
+ box : puppetlabs/centos-7.0-64-nocm
CONFIG:
type: foss
log_level: debug
diff --git a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml
index 71e8194..23dae1b 100644
--- a/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/debian-6-x86_64-vagrant.yml
@@ -4,7 +4,7 @@ HOSTS:
strict_variables:
platform: debian-6-amd64
hypervisor : vagrant
- box : puppetlabs/debian-6.0.9-64-nocm
+ box : puppetlabs/debian-6.0.10-64-nocm
CONFIG:
type: foss
log_level: debug
diff --git a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
index 97099de..86c2165 100644
--- a/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
+++ b/spec/acceptance/nodesets/debian-7-x86_64-vagrant.yml
@@ -4,8 +4,7 @@ HOSTS:
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
+ box : puppetlabs/debian-7.8-64-nocm
CONFIG:
type: foss
log_level: debug
diff --git a/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml
new file mode 100644
index 0000000..a3edb70
--- /dev/null
+++ b/spec/acceptance/nodesets/ubuntu-14.04-x86_64-vagrant.yml
@@ -0,0 +1,10 @@
+HOSTS:
+ ubuntu-14.04-x64:
+ default_apply_opts:
+ strict_variables:
+ platform: ubuntu-14.04-amd64
+ hypervisor : vagrant
+ box : puppetlabs/ubuntu-14.04-64-nocm
+CONFIG:
+ type: foss
+ log_level: debug