summaryrefslogtreecommitdiff
path: root/spec/acceptance/nodesets/default.yml
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2016-09-28 11:59:41 +0200
committervarac <varacanero@zeromail.org>2016-09-28 11:59:41 +0200
commit2558e45a5fe0ff6990eb5b722e1ba867014a9788 (patch)
tree2b2264a1eb20a9df1f4f3b02c83a970f5911fcef /spec/acceptance/nodesets/default.yml
parent4e23209eaccf1ab504d35158f4141b3053327c2f (diff)
parentcd6c3bc87e59bd51191c08515a7807071b3bb7a3 (diff)
Merge remote-tracking branch 'puppetlabs/master'HEADmaster
Diffstat (limited to 'spec/acceptance/nodesets/default.yml')
-rw-r--r--spec/acceptance/nodesets/default.yml12
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
index 05540ed..dba339c 100644
--- a/spec/acceptance/nodesets/default.yml
+++ b/spec/acceptance/nodesets/default.yml
@@ -1,10 +1,10 @@
HOSTS:
- centos-64-x64:
+ ubuntu-1404-x64:
roles:
- - master
- platform: el-6-x86_64
- box : centos-64-x64-vbox4210-nocm
- box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
- hypervisor : vagrant
+ - agent
+ - default
+ platform: ubuntu-14.04-amd64
+ hypervisor: vagrant
+ box: puppetlabs/ubuntu-14.04-64-nocm
CONFIG:
type: foss