NuKVM/vagrant-libvirt
3
0
Fork 0
mirror of https://github.com/vagrant-libvirt/vagrant-libvirt.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make LIBVIRT_DEFAULT_URI a fackball mechanism (#1223)

Browse Source 
Switch to only picking up LIBVIRT_DEFAULT_URI if no settings that could
affect the uri have been explicitly set. Some of these may not actually
appear in the URI depending on what is actually set or not set, however
it is important that should only use the env variable if the user has
not explicitly configured options relevant and instead allow them to
configure as needed.
This commit is contained in:
Darragh Bailey
2021-03-17 14:41:14 +00:00
committed by GitHub
parent b15489c557
commit 4ee40728b3
3 changed files with 50 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spec/unit/config_spec.rb
View File

@@ -123,41 +123,30 @@ describe VagrantPlugins::ProviderLibvirt::Config do
{:uri => 'qemu:///system'},
{'LIBVIRT_DEFAULT_URI' => 'qemu://session'},
],
[ # when driver explicitly set
{:driver => 'qemu'},
{:uri => 'qemu:///system?no_verify=1'},
{'LIBVIRT_DEFAULT_URI' => 'qemu://session'},
"LIBVIRT_DEFAULT_URI is not yet just a fallback behaviour"
],
[ # when host explicitly set
{:host => 'remote'},
{:uri => 'qemu://remote/system?no_verify=1'},
{:uri => 'qemu://remote/system?no_verify=1&keyfile=/home/tests/.ssh/id_rsa'},
{'LIBVIRT_DEFAULT_URI' => 'qemu://session'},
"LIBVIRT_DEFAULT_URI is not yet just a fallback behaviour"
],
[ # when connect_via_ssh explicitly set
{:connect_via_ssh => true},
{:uri => 'qemu+ssh:///system?no_verify=1&keyfile=/home/tests/.ssh/id_rsa'},
{:uri => 'qemu+ssh://localhost/system?no_verify=1&keyfile=/home/tests/.ssh/id_rsa'},
{'LIBVIRT_DEFAULT_URI' => 'qemu://session'},
"LIBVIRT_DEFAULT_URI is not yet just a fallback behaviour"
],
[ # when username explicitly set without host
{:username => 'my_user' },
{:uri => 'qemu://my_user@localhost/system?no_verify=1'},
{:uri => 'qemu:///system?no_verify=1&keyfile=/home/tests/.ssh/id_rsa'},
{'LIBVIRT_DEFAULT_URI' => 'qemu://session'},
"LIBVIRT_DEFAULT_URI is not yet just a fallback behaviour"
],
[ # when username explicitly set with host
{:username => 'my_user', :host => 'remote'},
{:uri => 'qemu://my_user@remote/system?no_verify=1'},
{:uri => 'qemu://remote/system?no_verify=1&keyfile=/home/tests/.ssh/id_rsa'},
{'LIBVIRT_DEFAULT_URI' => 'qemu://session'},
"LIBVIRT_DEFAULT_URI is not yet just a fallback behaviour"
],
[ # when password explicitly set
{:password => 'some_password'},
{:uri => 'qemu:///system?no_verify=1'},
{:uri => 'qemu:///system?no_verify=1&keyfile=/home/tests/.ssh/id_rsa'},
{'LIBVIRT_DEFAULT_URI' => 'qemu://session'},
"LIBVIRT_DEFAULT_URI is not yet just a fallback behaviour"
],
# driver settings