Skip to content
This repository has been archived by the owner on Jun 20, 2024. It is now read-only.

Upgrade smoke-tests to use 'overlay' storage and Ubuntu 15.04 #1125

Merged
merged 2 commits into from
Jul 14, 2015
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions test/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ require '../vagrant-common.rb'
def configure_docker(host, hostname, ip)
pkgs = %w(lxc-docker ethtool)

host.vm.box = "ubuntu/ubuntu-14.10-amd64"
host.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/utopic/current/utopic-server-cloudimg-amd64-vagrant-disk1.box"
host.vm.box = "ubuntu/ubuntu-15.04-amd64"
host.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/vivid/current/vivid-server-cloudimg-amd64-vagrant-disk1.box"

host.vm.hostname = hostname
host.vm.provision :shell, :inline => "hostnamectl set-hostname "+hostname
host.vm.network "private_network", ip: ip

host.vm.synced_folder ".", "/vagrant", disabled: true
Expand All @@ -28,9 +28,12 @@ def configure_docker(host, hostname, ip)
install_packages host.vm, pkgs
host.vm.provision :shell, :inline => "usermod -a -G docker vagrant; "

# Listen on the remote API
host.vm.provision :shell, :inline => "echo 'DOCKER_OPTS=\"-H unix:///var/run/docker.sock -H tcp://0.0.0.0:2375\"' >> /etc/default/docker"
host.vm.provision :shell, :inline => "service docker restart"
# Listen on the remote API and use overlay storage driver
host.vm.provision :shell, :inline => "sed -i -e's%-H fd://%-H fd:// -H tcp://0.0.0.0:2375 -s overlay%' /lib/systemd/system/docker.service"
host.vm.provision :shell, :inline => "systemctl daemon-reload"

host.vm.provision :shell, :inline => "systemctl start docker"
host.vm.provision :shell, :inline => "systemctl enable docker"
cleanup(host.vm)
end

Expand Down