diff options
author | Jason DeTiberus <jdetiber@redhat.com> | 2016-03-09 12:19:05 -0500 |
---|---|---|
committer | Jason DeTiberus <jdetiber@redhat.com> | 2016-03-10 08:37:57 -0500 |
commit | d4fa9b230d32fa11fafeab0cf347764108ab674a (patch) | |
tree | 84ae4e8f122e0e5e2e363c28e0a64f09af723b8b /playbooks/libvirt/openshift-cluster/templates/domain.xml | |
parent | c9301aa9682846a35dac6948cc0efb5d4628a3ad (diff) | |
download | openshift-d4fa9b230d32fa11fafeab0cf347764108ab674a.tar.gz openshift-d4fa9b230d32fa11fafeab0cf347764108ab674a.tar.bz2 openshift-d4fa9b230d32fa11fafeab0cf347764108ab674a.tar.xz openshift-d4fa9b230d32fa11fafeab0cf347764108ab674a.zip |
Libvirt provider fixes
- Use difference filter instead of reject/equalto
- add ability to override vcpu and memory config for vms
- add a dedicated drive for docker storage
Diffstat (limited to 'playbooks/libvirt/openshift-cluster/templates/domain.xml')
-rw-r--r-- | playbooks/libvirt/openshift-cluster/templates/domain.xml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/playbooks/libvirt/openshift-cluster/templates/domain.xml b/playbooks/libvirt/openshift-cluster/templates/domain.xml index 0ca8e0974..56f450642 100644 --- a/playbooks/libvirt/openshift-cluster/templates/domain.xml +++ b/playbooks/libvirt/openshift-cluster/templates/domain.xml @@ -1,6 +1,6 @@ <domain type='kvm' id='8'> <name>{{ item }}</name> - <memory unit='GiB'>1</memory> + <memory unit='MiB'>{{ os_libvirt_instance_memory_mib }}</memory> <metadata xmlns:ansible="https://github.com/ansible/ansible"> <ansible:tags> <ansible:tag>environment-{{ cluster_env }}</ansible:tag> @@ -9,8 +9,7 @@ <ansible:tag>sub-host-type-{{ g_sub_host_type }}</ansible:tag> </ansible:tags> </metadata> - <currentMemory unit='GiB'>1</currentMemory> - <vcpu placement='static'>2</vcpu> + <vcpu placement='static'>{{ os_libvirt_instance_vcpu }}</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> <boot dev='hd'/> @@ -35,10 +34,15 @@ <source file='{{ os_libvirt_storage_pool_path }}/{{ item }}.qcow2'/> <target dev='vda' bus='virtio'/> </disk> + <disk type='file' device='disk'> + <driver name='qemu' type='qcow2'/> + <source file='{{ os_libvirt_storage_pool_path }}/{{ item }}-docker.qcow2'/> + <target dev='vdb' bus='virtio'/> + </disk> <disk type='file' device='cdrom'> <driver name='qemu' type='raw'/> <source file='{{ os_libvirt_storage_pool_path }}/{{ item }}_cloud-init.iso'/> - <target dev='vdb' bus='virtio'/> + <target dev='vdc' bus='virtio'/> <readonly/> </disk> <controller type='usb' index='0' /> |