Fix ubuntu vagrant box nodesets

Without this patch, the nodesets incorrectly define a vagrantcloud vm
to install, resulting in the following error:

 > The box you're adding has a name different from the name you
 > requested.

This patch uses the trusty vagrant nodeset from the puppetlabs-apache
module and updates the default nodeset as well. Fill do the same for
the centos nodeset in a separate patch after RedHat tests are
implemented.

Change-Id: Iffac76b48d496d93b9cb63323ac103619319de47
This commit is contained in:
Colleen Murphy
2015-05-11 13:52:25 -07:00
parent 0db42a6a60
commit ffc5c0c00b
2 changed files with 4 additions and 4 deletions

View File

@@ -3,8 +3,8 @@ HOSTS:
roles:
- master
platform: ubuntu-14.04-amd64
box : trusty-server-cloudimg-amd64-vagrant-disk1
box_url : puppetlabs/ubuntu-14.04-64-nocm
box : puppetlabs/ubuntu-14.04-64-nocm
box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
hypervisor : vagrant
CONFIG:
log_level : debug

View File

@@ -3,8 +3,8 @@ HOSTS:
roles:
- master
platform: ubuntu-14.04-amd64
box : trusty-server-cloudimg-amd64-vagrant-disk1
box_url : puppetlabs/ubuntu-14.04-64-nocm
box : puppetlabs/ubuntu-14.04-64-nocm
box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
hypervisor : vagrant
CONFIG:
log_level : debug