diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-22 17:58:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-22 17:58:19 +0000 |
| commit | 1de5b6efa04c42bd674a67f2e01f38d9ebfc4e92 (patch) | |
| tree | b03839062dd8dc80262057a1c417cee6682d3afb | |
| parent | ee957af47183614f2ba8b47de3b3d5ed6053471b (diff) | |
| parent | e970d8b5bf2e774f8fd90278cebca032d93ceceb (diff) | |
| download | kolla-1de5b6efa04c42bd674a67f2e01f38d9ebfc4e92.tar.gz kolla-1de5b6efa04c42bd674a67f2e01f38d9ebfc4e92.zip | |
Merge "Change ubuntu base_image for vagrant to wily64"
| -rw-r--r-- | dev/vagrant/Vagrantfile | 2 | ||||
| -rw-r--r-- | dev/vagrant/Vagrantfile.custom.example | 2 |
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", |