aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-04-03 17:49:44 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-03 17:49:44 +0000
commit5d9b7f5c4bff05cf6a035604796595cf9b39eac2 (patch)
tree688b1deb5bc48309675935f0241f973278561aa0
parent18ef84d64b6d6db0e4a109acc4b7281b6f918615 (diff)
parentf3ea32005aafd12f539e476315e8936e802e4c52 (diff)
Merge "Revert Default vagrant provider"
-rw-r--r--.gitignore1
-rw-r--r--Vagrantfile3
-rwxr-xr-xtools/setup.sh2
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 acf71d9..a730026 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 <<EOF