summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gonzalez <daniel@gonzalez-nothnagel.de>2016-02-18 18:11:08 +0100
committerDaniel Gonzalez <daniel@gonzalez-nothnagel.de>2016-02-22 14:15:20 +0100
commite970d8b5bf2e774f8fd90278cebca032d93ceceb (patch)
treee8cb1fb5a38c861711121b9a7fbfbc7f8b8eab99
parent0e67afb73bf27ce3e0f5b0325c9394e5c8aa3be5 (diff)
downloadkolla-e970d8b5bf2e774f8fd90278cebca032d93ceceb.tar.gz
kolla-e970d8b5bf2e774f8fd90278cebca032d93ceceb.zip
Change ubuntu base_image for vagrant to wily64
The ubuntu-bootstrap.sh script tries to install the packet linux-image-generic-ls-wily when the kernel version is older than 4.2. This fails when using the default base image ubuntu/vivid64. Therefore this patch updates the base_image to ubuntu/wily64. Change-Id: Ieaf2d35a9a4304de2d1d78d8245d115dcb32bb0e Partial-Bug: #1547114
-rw-r--r--dev/vagrant/Vagrantfile2
-rw-r--r--dev/vagrant/Vagrantfile.custom.example2
2 files changed, 2 insertions, 2 deletions
diff --git a/dev/vagrant/Vagrantfile b/dev/vagrant/Vagrantfile
index a7e46533e..af29a8dbe 100644
--- a/dev/vagrant/Vagrantfile
+++ b/dev/vagrant/Vagrantfile
@@ -40,7 +40,7 @@ PROVIDER_DEFAULTS ||= {
kolla_path: "/home/vagrant/kolla"
},
ubuntu: {
- base_image: "ubuntu/vivid64",
+ base_image: "ubuntu/wily64",
bridge_interface: "wlp3s0b1",
vagrant_shared_folder: "/home/vagrant/sync",
sync_method: "nfs",
diff --git a/dev/vagrant/Vagrantfile.custom.example b/dev/vagrant/Vagrantfile.custom.example
index 125c1e560..60046d156 100644
--- a/dev/vagrant/Vagrantfile.custom.example
+++ b/dev/vagrant/Vagrantfile.custom.example
@@ -33,7 +33,7 @@
# kolla_path: "/home/vagrant/kolla"
# },
# ubuntu: {
-# base_image: "ubuntu/vivid64",
+# base_image: "ubuntu/wily64",
# bridge_interface: "wlp3s0b1",
# vagrant_shared_folder: "/home/vagrant/sync",
# sync_method: "nfs",