From: Tim Rozet Date: Thu, 27 Aug 2015 23:26:51 +0000 (+0000) Subject: Merge "Fixes vagrant base box to be opnfv" X-Git-Tag: arno.2015.2.0~52^2^2~7 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=61dd33982dfad48accfb5d5cb2bdfb3a71a86c08;hp=330b9af85924e9ff2bb6239914a1e267f77a9955;p=genesis.git Merge "Fixes vagrant base box to be opnfv" --- diff --git a/foreman/ci/Vagrantfile b/foreman/ci/Vagrantfile index a01da70..5550976 100644 --- a/foreman/ci/Vagrantfile +++ b/foreman/ci/Vagrantfile @@ -12,7 +12,7 @@ Vagrant.configure(2) do |config| # Every Vagrant development environment requires a box. You can search for # boxes at https://atlas.hashicorp.com/search. - config.vm.box = "chef/centos-7.0" + config.vm.box = "opnfv/centos-7.0" # Disable automatic box update checking. If you disable this, then # boxes will only be checked for updates when the user runs diff --git a/foreman/ci/deploy.sh b/foreman/ci/deploy.sh index 5216c48..f6b1823 100755 --- a/foreman/ci/deploy.sh +++ b/foreman/ci/deploy.sh @@ -387,8 +387,8 @@ install_vagrant() { fi ##add centos 7 box to vagrant - if ! vagrant box list | grep chef/centos-7.0; then - if ! vagrant box add chef/centos-7.0 --provider virtualbox; then + if ! vagrant box list | grep opnfv/centos-7.0; then + if ! vagrant box add opnfv/centos-7.0 --provider virtualbox; then printf '%s\n' 'deploy.sh: Unable to download centos7 box for Vagrant' >&2 exit 1 fi