From f3ea32005aafd12f539e476315e8936e802e4c52 Mon Sep 17 00:00:00 2001 From: Victor Morales Date: Tue, 3 Apr 2018 10:39:21 -0700 Subject: Revert Default vagrant provider Vagrant client has changed the DEFAULT_SERVER_URL string type for a constant[1]. This change is available since v2.0.3 and causes an error in those clients so it's necessary to revert the change I069eae9370ecdf1483098528cee57d9b3e81a41b which modifies that value. [1] https://github.com/hashicorp/vagrant/commit/f2bf18e56be36ed4bfbfe42fe20ab9147910ab3f Change-Id: I153a7adb9322244c34a55dd884cb75e158dfd54d Signed-off-by: Victor Morales Issue-ID: INT-434 --- .gitignore | 1 + Vagrantfile | 3 --- tools/setup.sh | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6b0319b..484ae7d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ etc/settings.yaml opt/* tests/installed-software* tests/remaining_projects.txt +*.vdi diff --git a/Vagrantfile b/Vagrantfile index 64dfb00..9ff0340 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,8 +1,6 @@ # -*- mode: ruby -*- # vi: set ft=ruby : -Vagrant::DEFAULT_SERVER_URL.replace('https://vagrantcloud.com') - configuration = { # Generic parameters used across all ONAP components 'key_name' => 'ecomp_key', @@ -297,7 +295,6 @@ nodes = [ ] run_path = 'vagrant_utils/postinstall.sh' -sdc_volume = 'vol1-sdc-data.vdi' Vagrant.require_version ">= 1.8.6" diff --git a/tools/setup.sh b/tools/setup.sh index fe3a3fc..565e989 100755 --- a/tools/setup.sh +++ b/tools/setup.sh @@ -8,7 +8,7 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -vagrant_version=2.0.2 +vagrant_version=2.0.3 function usage { cat <