README.md in vagrant-ovirt4-1.1.0 vs README.md in vagrant-ovirt4-1.2.0
- old
+ new
@@ -58,24 +58,25 @@
config.vm.box = 'ovirt4'
config.vm.hostname = "foo"
config.vm.box_url = 'https://github.com/myoung34/vagrant-ovirt4/blob/master/example_box/dummy.box?raw=true'
config.vm.network :private_network,
- :ip => '192.168.56.100', :nictype => 'virtio', :netmask => '255.255.255.0', #normal network configuration
- :ovirt__ip => '192.168.2.198', :ovirt__network_name => 'ovirtmgmt', :ovirt__gateway => '192.168.2.125' # oVirt specific information, overwrites previous on oVirt provider
+ :ovirt__network_name => 'ovirtmgmt' #DHCP
+ # Static configuration
+ #:ovirt__ip => '192.168.2.198', :ovirt__network_name => 'ovirtmgmt', :ovirt__gateway => '192.168.2.125', :ovirt__netmask => '255.255.0.0', :ovirt__dns_servers => '192.168.2.1', :ovirt__dns_search => 'test.local'
config.vm.provider :ovirt4 do |ovirt|
ovirt.url = 'https://server/ovirt-engine/api'
ovirt.username = "admin@internal"
ovirt.password = "password"
ovirt.insecure = true
ovirt.debug = true
ovirt.cluster = 'Default'
ovirt.template = 'Vagrant-Centos7-test'
ovirt.console = 'vnc'
- ovirt.memory_size = 512 #MB
- ovirt.memory_guaranteed = 256 #MB
+ ovirt.memory_size = '1 GiB' #see https://github.com/dominikh/filesize for usage
+ ovirt.memory_guaranteed = '256 MB' #see https://github.com/dominikh/filesize for usage
ovirt.cpu_cores = 2
ovirt.cpu_sockets = 2
ovirt.cpu_threads = 2
ovirt.cloud_init =<<EOF
write_files:
@@ -105,29 +106,25 @@
1. `username` => The username for the API. Required. String. No default value.
1. `password` => The password for the API. Required. String. No default value.
1. `insecure` => Allow connecting to SSL sites without certificates. Optional. Bool. Default is `false`
1. `debug` => Turn on additional log statements. Optional. Bool. Default is `false`.
1. `datacenter` => The name of the ovirt datacenter to create within. Required. String. No Default value.
- a. Note: (TODO) [Unknown usage](https://github.com/myoung34/vagrant-ovirt4/issues/26)
1. `template` => The name of the template to use for creation. Required. String. No Default value.
1. `cluster` => The name of the ovirt cluster to create within. Required. String. No Default value.
1. `console` => The type of remote viewing protocol to use. Required. String. No Default value.
- a. Note: (TODO) Enforce this to be Spice, VNC, and RDP
1. `memory_size` => The physical size of the memory for the VM (in MB). Defaults to `256`
1. `memory_guaranteed` => The guaranteed size of the memory for the VM (in MB). Note: cannot be larger than `memory_size`. Defaults to `memory_size`
1. `cpu_cores` => The number of CPU cores. Defaults to `1`
1. `cpu_sockets` => The number of CPU cores. Defaults to `1`
1. `cpu_threads` => The number of CPU threads. Defaults to `1`
1. `cloud_init` => The cloud-init data to pass. Must be properly formatted as yaml. [Docs here](http://cloudinit.readthedocs.io/en/latest/topics/examples.html)
+ 1. `affinity` => The affinity to use. [See this for possible uses](http://www.rubydoc.info/gems/ovirt-engine-sdk/OvirtSDK4/VmAffinity). Optional. Invalid will cause a `RuntimeError`
+ 1. `placement_host` => The host to start the VM on. Optional.
## Contributing
1. Fork it
2. Create your feature branch (`git checkout -b my-new-feature`)
3. Commit your changes (`git commit -am 'Add some feature'`)
4. Push to the branch (`git push origin my-new-feature`)
5. Create new Pull Request
-
-## Contributing Notes
-
-1. You must comment out `gemspec` in the [Gemfile](Gemfile), uncomment `vagrant` and `plugins/vagrant-ovirt4` in order for `bundle install` to work and use live code. Not sure why. Too lazy to figure it out.