Merge pull request #1578 from detiber/libvirt_fixes

Libvirt provider fixes

6 files changed, 34 insertions, 9 deletions

diff --git a/playbooks/libvirt/openshift-cluster/launch.yml b/playbooks/libvirt/openshift-cluster/launch.yml
index 3a48c82bc..30333f7be 100644
--- a/playbooks/libvirt/openshift-cluster/launch.yml
+++ b/playbooks/libvirt/openshift-cluster/launch.yml
@@ -10,6 +10,8 @@
     os_libvirt_storage_pool: "{{ libvirt_storage_pool | default('images') }}"
     os_libvirt_storage_pool_path: "{{ libvirt_storage_pool_path | default('/var/lib/libvirt/images') }}"
     os_libvirt_network: "{{ libvirt_network | default('default') }}"
+    os_libvirt_instance_memory_mib: "{{ lookup('oo_option', 'libvirt_instance_memory_mib') | default(1024) }}"
+    os_libvirt_instance_vcpu: "{{ lookup('oo_option', 'libvirt_instance_vcpu') | default(2) }}"
     image_url: "{{ deployment_vars[deployment_type].image.url }}"
     image_sha256: "{{ deployment_vars[deployment_type].image.sha256 }}"
     image_name: "{{ deployment_vars[deployment_type].image.name }}"
diff --git a/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml b/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml
index b00352539..d77b80c62 100644
--- a/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml
+++ b/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml
@@ -13,7 +13,7 @@
   get_url:
     url: '{{ image_url }}'
     sha256sum: '{{ image_sha256 }}'
-    dest: '{{ os_libvirt_storage_pool_path }}/{{ [image_name, image_compression] | reject("equalto", "") | join(".") }}'
+    dest: '{{ os_libvirt_storage_pool_path }}/{{ [image_name, image_compression] | difference([""]) | join(".") }}'
   when: '{{ ( lookup("oo_option", "skip_image_download") | default("no", True) | lower ) in ["false", "no"] }}'
   register: downloaded_image
 
@@ -59,10 +59,14 @@
 - name: Refresh the libvirt storage pool for openshift
   command: 'virsh -c {{ libvirt_uri }} pool-refresh {{ libvirt_storage_pool }}'
 
-- name: Create VMs drives
+- name: Create VM drives
   command: 'virsh -c {{ libvirt_uri }} vol-create-as {{ os_libvirt_storage_pool }} {{ item }}.qcow2 10G --format qcow2 --backing-vol {{ image_name }} --backing-vol-format qcow2'
   with_items: instances
 
+- name: Create VM docker drives
+  command: 'virsh -c {{ libvirt_uri }} vol-create-as {{ os_libvirt_storage_pool }} {{ item }}-docker.qcow2 10G --format qcow2 --allocation 0'
+  with_items: instances
+
 - name: Create VMs
   virt:
     name: '{{ item }}'
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' />
diff --git a/playbooks/libvirt/openshift-cluster/templates/user-data b/playbooks/libvirt/openshift-cluster/templates/user-data
index ead881f78..8b79940f4 100644
--- a/playbooks/libvirt/openshift-cluster/templates/user-data
+++ b/playbooks/libvirt/openshift-cluster/templates/user-data
@@ -4,6 +4,9 @@ disable_root: true
 hostname: {{ item[0] }}
 fqdn: {{ item[0] }}.example.com
 
+mounts:
+- [ vdb ]
+
 users:
   - default
   - name: root
@@ -23,6 +26,12 @@ write_files:
     permissions: 440
     content: |
         Defaults:openshift !requiretty
+  - content: |
+      DEVS=/dev/vdb
+      VG=docker_vg
+    path: /etc/sysconfig/docker-storage-setup
+    owner: root:root
+    permissions: '0644'
 
 runcmd:
   - NETWORK_CONFIG=/etc/sysconfig/network-scripts/ifcfg-eth0; if ! grep DHCP_HOSTNAME ${NETWORK_CONFIG}; then echo 'DHCP_HOSTNAME="{{ item[0] }}.example.com"' >> ${NETWORK_CONFIG}; fi; pkill -9 dhclient; service network restart
diff --git a/playbooks/libvirt/openshift-cluster/terminate.yml b/playbooks/libvirt/openshift-cluster/terminate.yml
index f4749c28d..d6251ac83 100644
--- a/playbooks/libvirt/openshift-cluster/terminate.yml
+++ b/playbooks/libvirt/openshift-cluster/terminate.yml
@@ -45,12 +45,18 @@
     - groups['oo_hosts_to_terminate']
     - [ destroy, undefine ]
 
-  - name: Delete VMs drives
+  - name: Delete VM drives
     command: 'virsh -c {{ libvirt_uri }} vol-delete --pool {{ libvirt_storage_pool }} {{ item }}.qcow2'
     args:
       removes: '{{ libvirt_storage_pool_path }}/{{ item }}.qcow2'
     with_items: groups['oo_hosts_to_terminate']
 
+  - name: Delete VM docker drives
+    command: 'virsh -c {{ libvirt_uri }} vol-delete --pool {{ libvirt_storage_pool }} {{ item }}-docker.qcow2'
+    args:
+      removes: '{{ libvirt_storage_pool_path }}/{{ item }}-docker.qcow2'
+    with_items: groups['oo_hosts_to_terminate']
+
   - name: Delete the VM cloud-init image
     file:
       path: '{{ libvirt_storage_pool_path }}/{{ item }}_cloud-init.iso'
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index a56f1f391..74c8b22ff 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -3,7 +3,7 @@
 - name: Install docker
   action: "{{ ansible_pkg_mgr }} name=docker state=present"
   when: not openshift.common.is_atomic | bool
-  
+
 - name: enable and start the docker service
   service:
     name: docker
@@ -15,4 +15,4 @@
     docker_service_status_changed: start_result | changed
 
 - include: udev_workaround.yml
-  when: docker_udev_workaround | default(False)
+  when: docker_udev_workaround | default(False) | bool