From ffc5c0c00bde7ad225fc38112175a1946b31f53b Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Mon, 11 May 2015 13:52:25 -0700 Subject: [PATCH] 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 --- spec/acceptance/nodesets/default.yml | 4 ++-- spec/acceptance/nodesets/ubuntu-server-1404-x64.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml index 0070b84c..cba1cd04 100644 --- a/spec/acceptance/nodesets/default.yml +++ b/spec/acceptance/nodesets/default.yml @@ -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 diff --git a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml index 0070b84c..cba1cd04 100644 --- a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml +++ b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml @@ -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