Skip to content

Commit

Permalink
ceph-volume tests alleviate libvirt timeouts when reloading
Browse files Browse the repository at this point in the history
See vagrant-libvirt comment:

    vagrant-libvirt/vagrant-libvirt#510 (comment)

And ceph-ansible commit:

    ceph/ceph-ansible@eae6ad6

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 1407747)
  • Loading branch information
Alfredo Deza committed Mar 6, 2018
1 parent 15c4a1a commit 59fd690
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/ceph-volume/ceph_volume/tests/functional/Vagrantfile
Expand Up @@ -84,6 +84,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
client.vm.provider :libvirt do |lv|
lv.memory = MEMORY
lv.random_hostname = true
lv.nic_model_type = "e1000"
end

# Parallels
Expand Down Expand Up @@ -122,6 +123,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
rgw.vm.provider :libvirt do |lv|
lv.memory = MEMORY
lv.random_hostname = true
lv.nic_model_type = "e1000"
end

# Parallels
Expand Down Expand Up @@ -160,6 +162,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
nfs.vm.provider :libvirt do |lv|
lv.memory = MEMORY
lv.random_hostname = true
lv.nic_model_type = "e1000"
end

# Parallels
Expand Down Expand Up @@ -197,6 +200,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
mds.vm.provider :libvirt do |lv|
lv.memory = MEMORY
lv.random_hostname = true
lv.nic_model_type = "e1000"
end
# Parallels
mds.vm.provider "parallels" do |prl|
Expand Down Expand Up @@ -233,6 +237,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
rbd_mirror.vm.provider :libvirt do |lv|
lv.memory = MEMORY
lv.random_hostname = true
lv.nic_model_type = "e1000"
end
# Parallels
rbd_mirror.vm.provider "parallels" do |prl|
Expand Down Expand Up @@ -269,6 +274,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
iscsi_gw.vm.provider :libvirt do |lv|
lv.memory = MEMORY
lv.random_hostname = true
lv.nic_model_type = "e1000"
end
# Parallels
iscsi_gw.vm.provider "parallels" do |prl|
Expand Down Expand Up @@ -305,6 +311,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
mon.vm.provider :libvirt do |lv|
lv.memory = MEMORY
lv.random_hostname = true
lv.nic_model_type = "e1000"
end

# Parallels
Expand Down Expand Up @@ -374,6 +381,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
end
lv.memory = MEMORY
lv.random_hostname = true
lv.nic_model_type = "e1000"
end

# Parallels
Expand Down

0 comments on commit 59fd690

Please sign in to comment.