Merge pull request #763 from openshift/master

Merge master into prod.

1 files changed, 30 insertions, 12 deletions

diff --git a/README_libvirt.md b/README_libvirt.md
index bcbaf4bd5..fd0250781 100644
--- a/README_libvirt.md
+++ b/README_libvirt.md
@@ -3,21 +3,23 @@ LIBVIRT Setup instructions
 
 `libvirt` is an `openshift-ansible` provider that uses `libvirt` to create local Fedora VMs that are provisioned exactly the same way that cloud VMs would be provisioned.
 
-This makes `libvirt` useful to develop, test and debug Openshift and openshift-ansible locally on the developer’s workstation before going to the cloud.
+This makes `libvirt` useful to develop, test and debug OpenShift and openshift-ansible locally on the developer’s workstation before going to the cloud.
 
 Install dependencies
 --------------------
 
-1.	Install [dnsmasq](http://www.thekelleys.org.uk/dnsmasq/doc.html)
-2.	Install [ebtables](http://ebtables.netfilter.org/)
-3.	Install [qemu](http://wiki.qemu.org/Main_Page)
-4.	Install [libvirt](http://libvirt.org/)
-5.	Enable and start the libvirt daemon, e.g:
+1.      Install [ansible](http://www.ansible.com/)
+2.	Install [dnsmasq](http://www.thekelleys.org.uk/dnsmasq/doc.html)
+3.	Install [ebtables](http://ebtables.netfilter.org/)
+4.	Install [qemu and qemu-system-x86](http://wiki.qemu.org/Main_Page)
+5.	Install [libvirt-python and libvirt](http://libvirt.org/)
+6.	Install [genisoimage](http://cdrkit.org/)
+7.	Enable and start the libvirt daemon, e.g:
 	-	`systemctl enable libvirtd`
 	-	`systemctl start libvirtd`
-6.	[Grant libvirt access to your user¹](https://libvirt.org/aclpolkit.html)
-7.	Check that your `$HOME` is accessible to the qemu user²
-8.	Configure dns resolution on the host³
+8.	[Grant libvirt access to your user¹](https://libvirt.org/aclpolkit.html)
+9.	Check that your `$HOME` is accessible to the qemu user²
+10.	Configure dns resolution on the host³
 
 #### ¹ Depending on your distribution, libvirt access may be denied by default or may require a password at each access.
 
@@ -68,9 +70,14 @@ If your `$HOME` is world readable, everything is fine. If your `$HOME` is privat
 error: Cannot access storage file '$HOME/libvirt-storage-pool-openshift/lenaic-master-216d8.qcow2' (as uid:99, gid:78): Permission denied
 ```
 
-In order to fix that issue, you have several possibilities:* set `libvirt_storage_pool_path` inside `playbooks/libvirt/openshift-cluster/launch.yml` and `playbooks/libvirt/openshift-cluster/terminate.yml` to a directory: * backed by a filesystem with a lot of free disk space * writable by your user; * accessible by the qemu user.* Grant the qemu user access to the storage pool.
+In order to fix that issue, you have several possibilities:
+ * set `libvirt_storage_pool_path` inside `playbooks/libvirt/openshift-cluster/launch.yml` and `playbooks/libvirt/openshift-cluster/terminate.yml` to a directory:
+   * backed by a filesystem with a lot of free disk space
+   * writable by your user;
+   * accessible by the qemu user.
+ * Grant the qemu user access to the storage pool.
 
-On Arch:
+On Arch or Fedora 22+:
 
 ```
 setfacl -m g:kvm:--x ~
@@ -89,7 +96,8 @@ dns=dnsmasq
 -	Configure dnsmasq to use the Virtual Network router for example.com:
 
 ```sh
-sudo vi /etc/NetworkManager/dnsmasq.d/libvirt_dnsmasq.conf server=/example.com/192.168.55.1
+sudo vi /etc/NetworkManager/dnsmasq.d/libvirt_dnsmasq.conf
+server=/example.com/192.168.55.1
 ```
 
 Test The Setup
@@ -102,6 +110,16 @@ Test The Setup
   bin/cluster list libvirt ''
 ```
 
+Configuration
+-------------
+
+The following options can be passed via the `-o` flag of the `create` command or as environment variables:
+
+* `image_url` (default to `http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2`): URL of the QCOW2 image to download
+* `image_name` (default to `CentOS-7-x86_64-GenericCloud.qcow2`): Name of the QCOW2 image to boot the VMs on
+* `image_sha256` (default to `e324e3ab1d24a1bbf035ddb365e7f9058c0b454acf48d7aa15c5519fae5998ab`): Expected SHA256 checksum of the downloaded image
+* `skip_image_download` (default to `no`): Skip QCOW2 image download. This requires the `image_name` QCOW2 image to be already present in `$HOME/libvirt-storage-pool-openshift-ansible`
+
 Creating a cluster
 ------------------