vagrant-libvirt 0.10.2 → 0.10.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/lib/vagrant-libvirt/config.rb +3 -1
- data/lib/vagrant-libvirt/driver.rb +2 -2
- data/lib/vagrant-libvirt/version +1 -1
- data/spec/unit/config_spec.rb +25 -0
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e424c510119507bbfc057c3f53ddef7151863d0680be4957c104cacd514ce737
|
4
|
+
data.tar.gz: 9453b83d2078e8787535da2dc6c558bfa44a44b4ce87e2218485e11d8eea0f70
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3abe6c5883f9c6b2b38890d7a2dfe1f87fc2f9290aad30e4742e62d9ba736ed6aacbb394b161e44621ab354087ba5b395d119bb31b006baf6166152553ea8d43
|
7
|
+
data.tar.gz: 69ce100c38dc5b7968da4bf2f0369e3eaa1b61763aa7d1fcd03cad117e060bc45df35560691c9928aebe42851414b6ba6ee73441943061e9a871461d70a21dcd
|
data/README.md
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
# Vagrant Libvirt Provider
|
2
2
|
|
3
|
-
![Vagrant Libvirt Logo](docs/
|
3
|
+
![Vagrant Libvirt Logo](docs/_assets/images/logo.png?raw=true "Vagrant Libvirt")
|
4
4
|
|
5
5
|
[![Join the chat at https://gitter.im/vagrant-libvirt/vagrant-libvirt](https://badges.gitter.im/vagrant-libvirt/vagrant-libvirt.svg)](https://gitter.im/vagrant-libvirt/vagrant-libvirt?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
6
6
|
[![Build Status](https://github.com/vagrant-libvirt/vagrant-libvirt/actions/workflows/unit-tests.yml/badge.svg)](https://github.com/vagrant-libvirt/vagrant-libvirt/actions/workflows/unit-tests.yml)
|
@@ -782,7 +782,7 @@ module VagrantPlugins
|
|
782
782
|
finalize_id_ssh_key_file
|
783
783
|
|
784
784
|
uri += '+ssh://'
|
785
|
-
uri += "#{@username}@" if @username && @username != UNSET_VALUE
|
785
|
+
uri += "#{URI.encode_www_form_component(@username)}@" if @username && @username != UNSET_VALUE
|
786
786
|
|
787
787
|
uri += (@host && @host != UNSET_VALUE ? @host : 'localhost')
|
788
788
|
|
@@ -1089,6 +1089,8 @@ module VagrantPlugins
|
|
1089
1089
|
|
1090
1090
|
def merge(other)
|
1091
1091
|
super.tap do |result|
|
1092
|
+
result.boot_order = other.boot_order != [] ? other.boot_order : boot_order
|
1093
|
+
|
1092
1094
|
c = disks.dup
|
1093
1095
|
c += other.disks
|
1094
1096
|
result.disks = c
|
@@ -202,11 +202,11 @@ module VagrantPlugins
|
|
202
202
|
end
|
203
203
|
|
204
204
|
def list_host_devices
|
205
|
-
|
205
|
+
connection.client.list_all_interfaces
|
206
206
|
end
|
207
207
|
|
208
208
|
def list_networks
|
209
|
-
|
209
|
+
connection.client.list_all_networks
|
210
210
|
end
|
211
211
|
|
212
212
|
private
|
data/lib/vagrant-libvirt/version
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.10.
|
1
|
+
0.10.3
|
data/spec/unit/config_spec.rb
CHANGED
@@ -197,6 +197,13 @@ describe VagrantPlugins::ProviderLibvirt::Config do
|
|
197
197
|
:env => {'LIBVIRT_DEFAULT_URI' => 'qemu:///custom'},
|
198
198
|
}
|
199
199
|
],
|
200
|
+
[ # when username explicitly set with @ symbol for domains
|
201
|
+
{:username => 'my_user@my_domain', :host => 'remote'},
|
202
|
+
{:uri => %r{qemu://remote/(system|session)}, :username => 'my_user@my_domain'},
|
203
|
+
{
|
204
|
+
:env => {'LIBVIRT_DEFAULT_URI' => 'qemu:///custom'},
|
205
|
+
}
|
206
|
+
],
|
200
207
|
[ # when username explicitly set with host but without ssh
|
201
208
|
{:username => 'my_user', :host => 'remote'},
|
202
209
|
{:uri => %r{qemu://remote/(system|session)}, :username => 'my_user'},
|
@@ -862,5 +869,23 @@ describe VagrantPlugins::ProviderLibvirt::Config do
|
|
862
869
|
)
|
863
870
|
end
|
864
871
|
end
|
872
|
+
|
873
|
+
context 'boot_order' do
|
874
|
+
it 'should merge' do
|
875
|
+
one.boot 'network'
|
876
|
+
|
877
|
+
subject.finalize!
|
878
|
+
expect(subject.boot_order).to eq(['network'])
|
879
|
+
end
|
880
|
+
|
881
|
+
it 'should have last definition win' do
|
882
|
+
one.boot 'network'
|
883
|
+
two.boot 'hd'
|
884
|
+
two.boot 'cdrom'
|
885
|
+
|
886
|
+
subject.finalize!
|
887
|
+
expect(subject.boot_order).to eq(['hd', 'cdrom'])
|
888
|
+
end
|
889
|
+
end
|
865
890
|
end
|
866
891
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: vagrant-libvirt
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.10.
|
4
|
+
version: 0.10.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Lukas Stanek
|
@@ -11,7 +11,7 @@ authors:
|
|
11
11
|
autorequire:
|
12
12
|
bindir: bin
|
13
13
|
cert_chain: []
|
14
|
-
date: 2022-08-
|
14
|
+
date: 2022-08-26 00:00:00.000000000 Z
|
15
15
|
dependencies:
|
16
16
|
- !ruby/object:Gem::Dependency
|
17
17
|
name: fog-libvirt
|