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

Merge pull request #446 from dustymabe/master

Browse Source 
A few spelling/wording enhancements.
This commit is contained in:
Dmitry Vasilets 2015-08-25 16:52:56 +02:00
commit 8985fbd494
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -374,7 +374,7 @@ You can create and attach additional disks to a VM via `libvirt.storage :file`.
* `type` - Type of disk image to create. Defaults to *qcow2*.
* `bus` - Type of bus to connect device to. Defaults to *virtio*.
* `cache` - Cache mode to use, e.g. `none`, `writeback`, `writethrough` (see the [libvirt documentation for possible values](http://libvirt.org/formatdomain.html#elementsDisks) or [here](https://www.suse.com/documentation/sles11/book_kvm/data/sect1_chapter_book_kvm.html) for a fuller explanation). Defaults to *default*.
* `allow_existing` - Set to true if you want to allow the VM to use a pre-existing disk. This is useful for sharing disks between VMs, e.g. in order to simulate shared SAN storage. Shared disks removed only manualy.If not exists - will created. If exists - using existed.
* `allow_existing` - Set to true if you want to allow the VM to use a pre-existing disk. This is useful for sharing disks between VMs, e.g. in order to simulate shared SAN storage. Shared disks removed only manually. If not exists - will created. If exists - using existed.
The following example creates two additional disks.

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

@ -162,7 +162,7 @@ module VagrantPlugins
@disks.each do |disk|
msg = " -- Disk(#{disk[:device]}): #{disk[:absolute_path]}"
msg += ' (shared. Remove only manualy)' if disk[:allow_existing]
msg += ' (shared. Remove only manually)' if disk[:allow_existing]
msg += ' Not created - using existed.' if disk[:preexisting]
env[:ui].info(msg)
end

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

@ -37,10 +37,10 @@ module VagrantPlugins
domain.destroy(destroy_volumes: false)
env[:machine].provider_config.disks.each do |disk|
# shared disks remove only manualy or ???
# shared disks remove only manually or ???
next if disk[:allow_existing]
diskname = libvirt_domain.name + '-' + disk[:device] + '.' + disk[:type].to_s
# diskname is uniq
# diskname is unique
libvirt_disk = domain.volumes.select do |x|
x.name == diskname
end.first

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

@ -11,7 +11,7 @@ module VagrantPlugins
def call(env)
env[:ui].info("Vagrant-libvirt plugin removed box only from you LOCAL ~/.vagrant/boxes directory")
env[:ui].info("From libvirt storage pool you have to delete image manualy(virsh, virt-manager or by any other tool)")
env[:ui].info("From libvirt storage pool you have to delete image manually(virsh, virt-manager or by any other tool)")
@app.call(env)
end
end

6
locales/en.yml
View File

@ -56,7 +56,7 @@ en:
the minimum box image size of '%{box_virtual_size}'.
errors:
package_not_supported: Not support package for libvirt. Create box manualy.
package_not_supported: No support for package with libvirt. Create box manually.
fog_error: |-
There was an error talking to Libvirt. The error message is shown
below:
@ -79,7 +79,7 @@ en:
Interface adapter number is already in use. Please specify other adapter
number.
rsync_error: |-
There was an error when attemping to rsync a share folder.
There was an error when attempting to rsync a share folder.
Please inspect the error message below for more info.
Host path: %{hostpath}
@ -123,7 +123,7 @@ en:
Network %{network_name} exists but does not have dhcp %{requested}.
Please fix your configuration and run vagrant again.
create_network_error: |-
Error occured while creating new network: %{error_message}.
Error occurred while creating new network: %{error_message}.
network_not_available_error: |-
Network %{network_name} is not available. Specify available network
name, or an ip address if you want to create a new network.