README.md in vagrant-ovirt4-1.2.2 vs README.md in vagrant-ovirt4-1.2.3

- old
+ new

@@ -54,11 +54,11 @@ ### Configuration example ``` Vagrant.configure("2") do |config| config.vm.box = 'ovirt4' - config.vm.hostname = "foo" + 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, :ovirt__network_name => 'ovirtmgmt' #DHCP # Static configuration @@ -68,26 +68,32 @@ ovirt.url = 'https://server/ovirt-engine/api' ovirt.username = "admin@internal" ovirt.password = "password" ovirt.insecure = true ovirt.debug = true + ovirt.filtered_api = true #see http://www.ovirt.org/develop/release-management/features/infra/user-portal-permissions/ ovirt.cluster = 'Default' ovirt.template = 'Vagrant-Centos7-test' ovirt.console = 'vnc' + ovirt.disk_size = '15 GB' # only growing is supported. works the same way as below memory settings 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.bios_serial = aaabbbb-ccc-dddd + ovirt.optimized_for = 'server' ovirt.cloud_init =<<EOF write_files: - content: | Hello, world! path: /tmp/greeting.txt permissions: '0644' EOF + # additional disks + ovirt.storage :file, size: "8 GiB", type: 'qcow2', storage_domain: "mystoragedomain" end end ``` ### Configuration options @@ -105,11 +111,10 @@ 1. `url` => The URL for the API. Required. String. No default value. 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. 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. 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` @@ -117,15 +122,21 @@ 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. + 1. `bios_serial` => The BIOS serial number to assign. Optional. + 1. `optimized_for` => The "optimized for" setting. Can be one of 'Desktop' or 'Server' (case insensitive). Optional. + 1. `storage` => adds a new storage disk to the VM + a. `size`: the size of the disk + a. `type`: the type of disk. It can be either `qcow2` or `raw` + a. `storage_domain`: the storage domain where the disk should be created ## Testing Currently pull-requests are tested via [test-kitchen using kitchen-vagrant](https://github.com/test-kitchen/kitchen-vagrant). -See [Jenkinsfile](Jenkinsfile) for more information. +See [Jenkinsfile](Jenkinsfile) for more information. If you'd like to run them yourself, however, they make not work in all setups. For example they assume `192.168.2.0/24`, host pinning will probably not have a host that's in all set ups, and the template names might not match. To run Unit tests: `bundle install; bundle exec rspec` To run acceptance tests: