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

Fix typos

Browse Source
This commit is contained in:
a1346054 2022-08-08 21:11:10 +00:00
parent b5e3f156e3
commit dbd2d3fdce
No known key found for this signature in database
GPG Key ID: D149AD21DC40440C
15 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Gemfile
View File

@ -24,9 +24,9 @@ group :development do
vagrant_gem_version = Gem::Version.new('2.2.8')
end
vagrant_spec_verison = ENV['VAGRANT_SPEC_VERSION']
if !vagrant_spec_verison.nil? && !vagrant_spec_verison.empty?
gem 'vagrant-spec', :git => 'https://github.com/hashicorp/vagrant-spec', :ref => vagrant_spec_verison
vagrant_spec_version = ENV['VAGRANT_SPEC_VERSION']
if !vagrant_spec_version.nil? && !vagrant_spec_version.empty?
gem 'vagrant-spec', :git => 'https://github.com/hashicorp/vagrant-spec', :ref => vagrant_spec_version
elsif vagrant_gem_version <= Gem::Version.new('2.2.7')
gem 'vagrant-spec', :git => 'https://github.com/hashicorp/vagrant-spec', :ref => '161128f2216cee8edb7bcd30da18bd4dea86f98a'
else

16
docs/configuration.markdown
View File

@ -82,7 +82,7 @@ end
`disk_bus` is set to `scsi` or `disk_device` starts with `sd`, which is a hint
to use scsi. Defaults to `virtio-scsi` when it encounters either of the
config values for `disk_bus` or `disk_device`. See [libvirt controller models](
https://libvirt.org/formatdomain.html#controllers) for other posible values.
https://libvirt.org/formatdomain.html#controllers) for other possible values.
NOTE: this option applies only to the disks associated with a box image.
* `disk_device` - The disk device to emulate. Defaults to vda if not
set, which should be fine for paravirtualized guests, but some fully
@ -418,7 +418,7 @@ starts with `libvirt__` string. Here is a list of those options:
only when dhcp is enabled.By default is the same host that runs the DHCP
server.
* `:libvirt__tftp_root` - Path to the root directory served via TFTP.
* `:libvirt__adapter` - Number specifiyng sequence number of interface.
* `:libvirt__adapter` - Number specifying sequence number of interface.
* `:libvirt__forward_mode` - Specify one of `veryisolated`, `none`, `open`, `nat`
or `route` options. This option is used only when creating new network. Mode
`none` will create isolated network without NATing or routing outside. You
@ -472,7 +472,7 @@ starts with `libvirt__` string. Here is a list of those options:
* `:libvirt__driver_name` - Define which network driver to use. [More
info](https://libvirt.org/formatdomain.html#elementsDriverBackendOptions)
* `:libvirt__driver_queues` - Define a number of queues to be used for network
interface. Set equal to numer of vCPUs for best performance. [More
interface. Set equal to number of vCPUs for best performance. [More
info](http://www.linux-kvm.org/page/Multiqueue)
* `:autostart` - Automatic startup of network by the Libvirt daemon.
If not specified the default is 'false'.
@ -549,7 +549,7 @@ the corresponding IP address.
It is also possible to use the Qemu Agent to extract the management interface
configuration from the booted virtual machine. This is helpful in libvirt
environments where no local dnsmasq is used for automatic address assigment,
environments where no local dnsmasq is used for automatic address assignment,
but external dhcp services via bridged libvirt networks.
Prerequisite is to enable the qemu agent channel via ([Libvirt communication
@ -582,7 +582,7 @@ to setup a bridged host network manually and define it via
You can create and attach additional disks to a VM via `libvirt.storage :file`.
It has a number of options:
* `path` - Location of the disk image. If unspecified, a path is automtically
* `path` - Location of the disk image. If unspecified, a path is automatically
chosen in the same storage pool as the VMs primary disk.
* `device` - Name of the device node the disk image will have in the VM, e.g.
*vdb*. If unspecified, the next available device is chosen.
@ -705,7 +705,7 @@ Vagrant.configure("2") do |config|
config.vm.provider :libvirt do |libvirt|
libvirt.pci :domain => '0x0000', :bus => '0x06', :slot => '0x12', :function => '0x5'
# Add another one if it is neccessary
# Add another one if it is necessary
libvirt.pci :domain => '0x0000', :bus => '0x03', :slot => '0x00', :function => '0x0'
end
end
@ -808,7 +808,7 @@ Note that in order to enable USB redirection with Spice clients,
you may need to also set `libvirt.graphics_type = "spice"`
#### Filter for USB Redirector Devices
You can define filter for redirected devices. These filters can be positiv or negative, by setting the mandatory option `allow=yes` or `allow=no`. All available options are listed below. Note the option `allow` is mandatory.
You can define filter for redirected devices. These filters can be positive or negative, by setting the mandatory option `allow=yes` or `allow=no`. All available options are listed below. Note the option `allow` is mandatory.
* `class` - The device class of the USB device. A list of device classes is available on [Wikipedia](https://en.wikipedia.org/wiki/USB#Device_classes).
* `vendor` - The vendor of the USB device.
@ -901,7 +901,7 @@ end
```
## Smartcard device
A virtual smartcard device can be supplied to the guest via the `libvirt.smartcard` element. The option `mode` is mandatory and currently only value `passthrough` is supported. The value `spicevmc` for option `type` is default value and can be supressed. On using `type = tcp`, the options `source_mode`, `source_host` and `source_service` are mandatory.
A virtual smartcard device can be supplied to the guest via the `libvirt.smartcard` element. The option `mode` is mandatory and currently only value `passthrough` is supported. The value `spicevmc` for option `type` is default value and can be suppressed. On using `type = tcp`, the options `source_mode`, `source_host` and `source_service` are mandatory.
```ruby
Vagrant.configure("2") do |config|

2
docs/examples.markdown
View File

@ -95,7 +95,7 @@ that due to a well known limitation only the TCP protocol is supported. For
each `forwarded_port` directive you specify in your Vagrantfile,
vagrant-libvirt will maintain an active ssh process for the lifetime of the VM.
If your VM should happen to be rebooted, the SSH session will need to be
restablished by halting the VM and bringing it back up.
re-established by halting the VM and bringing it back up.
vagrant-libvirt supports an additional `forwarded_port` option `gateway_ports`
which defaults to `false`, but can be set to `true` if you want the forwarded

4
docs/installation.markdown
View File

@ -396,7 +396,7 @@ git checkout imports/c8s/libssh-0.9.4-1.el8
into_srpm.sh -d c8s
cd SRPMS
# common commands (make sure to adjust verison accordingly)
# common commands (make sure to adjust version accordingly)
rpm2cpio libssh-0.9.4-1c8s.src.rpm | cpio -imdV
tar xf libssh-0.9.4.tar.xz
mkdir build
@ -428,7 +428,7 @@ get_sources.sh
into_srpm.sh -d c8s
cd SRPMS
# common commands (make sure to adjust verison accordingly)
# common commands (make sure to adjust version accordingly)
rpm2cpio krb5-1.18.2-8c8s.src.rpm | cpio -imdV
tar xf krb5-1.18.2.tar.gz
cd krb5-1.18.2/src

2
lib/vagrant-libvirt/action.rb
View File

@ -162,7 +162,7 @@ module VagrantPlugins
# Start it..
b3.use StartDomain
# Machine should gain IP address when comming up,
# Machine should gain IP address when coming up,
# so wait for dhcp lease and store IP into machines data_dir.
b3.use WaitTillUp
require 'vagrant/action/builtin/wait_for_communicator'

2
lib/vagrant-libvirt/action/create_network_interfaces.rb
View File

@ -41,7 +41,7 @@ module VagrantPlugins
# Vagrant gives you adapter 0 by default
# Assign interfaces to slots.
configured_networks(env, @logger).each do |options|
# dont need to create interface for this type
# don't need to create interface for this type
next if options[:iface_type] == :forwarded_port
# TODO: fill first ifaces with adapter option specified.

4
lib/vagrant-libvirt/action/create_networks.rb
View File

@ -44,7 +44,7 @@ module VagrantPlugins
end
# only one vm at a time should try to set up networks
# otherwise they'll have inconsitent views of current state
# otherwise they'll have inconsistent views of current state
# and conduct redundant operations that cause errors
@@lock.synchronize do
# Iterate over networks If some network is not
@ -124,7 +124,7 @@ module VagrantPlugins
# Throw an error if dhcp setting for an existing network does not
# match what was configured in the vagrantfile
# since we always enable dhcp for the management network
# this ensures we wont start a vm vagrant cant reach
# this ensures we won't start a vm vagrant can't reach
# Allow the situation where DHCP is not requested (:libvirt__dhcp_enabled == false)
# but where it is enabled on the virtual network
def verify_dhcp

2
lib/vagrant-libvirt/action/destroy_networks.rb
View File

@ -50,7 +50,7 @@ module VagrantPlugins
if e.libvirt_code == ProviderLibvirt::Util::ErrorCodes::VIR_ERR_NO_NETWORK
@logger.info 'It is already undefined'
next
# some other error occured, so raise it again
# some other error occurred, so raise it again
else
raise e
end

2
lib/vagrant-libvirt/action/start_domain.rb
View File

@ -64,7 +64,7 @@ module VagrantPlugins
disk_target.parent.delete_element("#{disk_target.parent.xpath}/address")
end
# Iterface type
# Interface type
unless config.nic_model_type.nil?
REXML::XPath.each(xml_descr, '/domain/devices/interface/model') do |iface_model|
if iface_model.attributes['type'] != config.nic_model_type

4
lib/vagrant-libvirt/config.rb
View File

@ -11,7 +11,7 @@ module VagrantPlugins
module ProviderLibvirt
class Config < Vagrant.plugin('2', :config)
# manually specify URI
# will supercede most other options if provided
# will supersede most other options if provided
attr_accessor :uri
# A hypervisor name to access via Libvirt.
@ -1016,7 +1016,7 @@ module VagrantPlugins
end
if @qemu_use_agent == true
# if qemu agent is used to optain domain ip configuration, at least
# if qemu agent is used to obtain domain ip configuration, at least
# one qemu channel has to be configured. As there are various options,
# error out and leave configuration to the user
unless machine.provider_config.channels.any? { |channel| channel[:target_name].start_with?("org.qemu.guest_agent") }

2
lib/vagrant-libvirt/driver.rb
View File

@ -239,7 +239,7 @@ module VagrantPlugins
interface['ip-addresses'].each do |ip|
# returning ipv6 addresses might break windows guests because
# winrm cant handle connection, winrm fails with "invalid uri"
# winrm can't handle connection, winrm fails with "invalid uri"
next unless ip['ip-address-type'] == 'ipv4'
ip_address = ip['ip-address']

2
lib/vagrant-libvirt/provider.rb
View File

@ -52,7 +52,7 @@ module VagrantPlugins
# :username => "mitchellh",
# :private_key_path => "/path/to/my/key"
# }
# note that modifing @machine.id or accessing @machine.state is not
# note that modifying @machine.id or accessing @machine.state is not
# thread safe, so be careful to avoid these here as this method may
# be called from other threads of execution.
return nil if state.id != :running

2
locales/en.yml
View File

@ -16,7 +16,7 @@ en:
Created volume larger than box defaults, will require manual resizing of
filesystems to utilize.
box_version_missing: |-
No verison detected for %{name}, using timestamp to watch for modifications. Consider
No version detected for %{name}, using timestamp to watch for modifications. Consider
generating a local metadata for the box with a version to allow better handling.
See https://www.vagrantup.com/docs/boxes/format#box-metadata for further details.
uploading_volume: |-

4
spec/unit/action/handle_box_image_spec.rb
View File

@ -104,7 +104,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::HandleBoxImage do
it 'should use the box file timestamp' do
expect(ui).to receive(:warn).with(
"No verison detected for test, using timestamp to watch for modifications. Consider\n" +
"No version detected for test, using timestamp to watch for modifications. Consider\n" +
"generating a local metadata for the box with a version to allow better handling.\n" +
'See https://www.vagrantup.com/docs/boxes/format#box-metadata for further details.'
)
@ -134,7 +134,7 @@ describe VagrantPlugins::ProviderLibvirt::Action::HandleBoxImage do
end
it 'should use the box file timestamp' do
expect(ui).to receive(:warn).with(/No verison detected for test/)
expect(ui).to receive(:warn).with(/No version detected for test/)
expect(subject.call(env)).to be_nil
expect(env[:box_volume_number]).to eq(1)

2
spec/unit/driver_spec.rb
View File

@ -197,7 +197,7 @@ describe VagrantPlugins::ProviderLibvirt::Driver do
allow(machine.provider_config).to receive(:qemu_use_session).and_return(true)
end
it 'should retreive the address via the system dhcp-leases API' do
it 'should retrieve the address via the system dhcp-leases API' do
expect(domain).to receive(:mac).and_return("52:54:00:8b:dc:5f")
expect(subject).to receive(:system_connection).and_return(system_connection1)
expect(system_connection1).to receive(:list_all_networks).and_return(networks)