diff options
| author | Ashley Penney <ashley.penney@puppetlabs.com> | 2014-05-09 19:15:17 -0400 |
|---|---|---|
| committer | Ashley Penney <ashley.penney@puppetlabs.com> | 2014-05-09 19:15:17 -0400 |
| commit | 08b00d9229961d7b3c3cba997bfb35c8d47e4c4b (patch) | |
| tree | b63639c8dbf2a3f63893f400061ce47d24062c5d /spec/acceptance | |
| parent | 04fa5a0cd9255dc2d51af517be7164db9ea0306b (diff) | |
| parent | 14c9155745fe4b472e530da6965c0866b6f2640d (diff) | |
| download | puppet-stdlib-08b00d9229961d7b3c3cba997bfb35c8d47e4c4b.tar.gz puppet-stdlib-08b00d9229961d7b3c3cba997bfb35c8d47e4c4b.tar.bz2 | |
Merge pull request #254 from apenney/421
Prepare a 4.2.1 release.
Diffstat (limited to 'spec/acceptance')
| -rw-r--r-- | spec/acceptance/nodesets/centos-65-x64.yml | 10 | ||||
| -rw-r--r--[l---------] | spec/acceptance/nodesets/default.yml | 11 |
2 files changed, 10 insertions, 11 deletions
diff --git a/spec/acceptance/nodesets/centos-65-x64.yml b/spec/acceptance/nodesets/centos-65-x64.yml deleted file mode 100644 index 4e2cb80..0000000 --- a/spec/acceptance/nodesets/centos-65-x64.yml +++ /dev/null @@ -1,10 +0,0 @@ -HOSTS: - centos-65-x64: - roles: - - master - platform: el-6-x86_64 - box : centos-65-x64-vbox436-nocm - box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box - hypervisor : vagrant -CONFIG: - type: foss diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml index 2719644..4e2cb80 120000..100644 --- a/spec/acceptance/nodesets/default.yml +++ b/spec/acceptance/nodesets/default.yml @@ -1 +1,10 @@ -centos-64-x64.yml
\ No newline at end of file +HOSTS: + centos-65-x64: + roles: + - master + platform: el-6-x86_64 + box : centos-65-x64-vbox436-nocm + box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box + hypervisor : vagrant +CONFIG: + type: foss |