From d3faaccc614c694b539e6fb8c02327da4f9b296b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9na=C3=AFc=20Huard?= <lhuard@amadeus.com>
Date: Mon, 22 Aug 2016 17:53:20 +0200
Subject: Replace some virsh commands by native virt_XXX ansible module

---
 .../tasks/configure_libvirt_network.yml            | 36 ++++++----------------
 .../tasks/configure_libvirt_storage_pool.yml       | 29 +++++++++--------
 .../openshift-cluster/tasks/launch_instances.yml   |  2 +-
 .../openshift-cluster/templates/network.xml        |  2 +-
 .../openshift-cluster/templates/storage-pool.xml   |  6 ++++
 5 files changed, 34 insertions(+), 41 deletions(-)
 create mode 100644 playbooks/libvirt/openshift-cluster/templates/storage-pool.xml

(limited to 'playbooks/libvirt/openshift-cluster')

diff --git a/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_network.yml b/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_network.yml
index 3117d9edc..b42ca83af 100644
--- a/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_network.yml
+++ b/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_network.yml
@@ -1,27 +1,11 @@
 ---
-- name: Test if libvirt network for openshift already exists
-  command: "virsh -c {{ libvirt_uri }} net-info {{ libvirt_network }}"
-  register: net_info_result
-  changed_when: False
-  failed_when: "net_info_result.rc != 0 and 'no network with matching name' not in net_info_result.stderr"
-
-- name: Create a temp directory for the template xml file
-  command: "mktemp -d /tmp/openshift-ansible-XXXXXXX"
-  register: mktemp
-  when: net_info_result.rc == 1
-
-- name: Create network xml file
-  template:
-    src: templates/network.xml
-    dest: "{{ mktemp.stdout }}/network.xml"
-  when: net_info_result.rc == 1
-
-- name: Create libvirt network for openshift
-  command: "virsh -c {{ libvirt_uri }} net-create {{ mktemp.stdout }}/network.xml"
-  when: net_info_result.rc == 1
-
-- name: Remove the temp directory
-  file:
-    path: "{{ mktemp.stdout }}"
-    state: absent
-  when: net_info_result.rc == 1
+- name: Create the libvirt network for OpenShift
+  virt_net:
+    name: '{{ libvirt_network }}'
+    state: '{{ item }}'
+    autostart: 'yes'
+    xml: "{{ lookup('template', 'network.xml') }}"
+    uri: '{{ libvirt_uri }}'
+  with_items:
+    - present
+    - active
diff --git a/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_storage_pool.yml b/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_storage_pool.yml
index 397158b9e..8685624ec 100644
--- a/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_storage_pool.yml
+++ b/playbooks/libvirt/openshift-cluster/tasks/configure_libvirt_storage_pool.yml
@@ -6,22 +6,25 @@
 
 # We need to set permissions on the directory and any items created under the directory, so we need to call the acl module with and without default set.
 - acl:
-    default: "{{ item }}"
+    default: '{{ item.default }}'
     entity: kvm
     etype: group
     name: "{{ libvirt_storage_pool_path }}"
-    permissions: rwx
+    permissions: '{{ item.permissions }}'
     state: present
   with_items:
-    - no
-    - yes
+    - default: no
+      permissions: x
+    - default: yes
+      permissions: rwx
 
-- name: Test if libvirt storage pool for openshift already exists
-  command: "virsh -c {{ libvirt_uri }} pool-info {{ libvirt_storage_pool }}"
-  register: pool_info_result
-  changed_when: False
-  failed_when: "pool_info_result.rc != 0 and 'no storage pool with matching name' not in pool_info_result.stderr"
-
-- name: Create the libvirt storage pool for openshift
-  command: 'virsh -c {{ libvirt_uri }} pool-create-as {{ libvirt_storage_pool }} dir --target {{ libvirt_storage_pool_path }}'
-  when: pool_info_result.rc == 1
+- name: Create the libvirt storage pool for OpenShift
+  virt_pool:
+    name: '{{ libvirt_storage_pool }}'
+    state: '{{ item }}'
+    autostart: 'yes'
+    xml: "{{ lookup('template', 'storage-pool.xml') }}"
+    uri: '{{ libvirt_uri }}'
+  with_items:
+    - present
+    - active
diff --git a/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml b/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml
index cc34d0ef9..e0afc43ba 100644
--- a/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml
+++ b/playbooks/libvirt/openshift-cluster/tasks/launch_instances.yml
@@ -134,4 +134,4 @@
   delay: 1
   with_together:
   - '{{ instances }}'
-  - '{{ ips }}'
\ No newline at end of file
+  - '{{ ips }}'
diff --git a/playbooks/libvirt/openshift-cluster/templates/network.xml b/playbooks/libvirt/openshift-cluster/templates/network.xml
index 050bc7ab9..0ce2a8342 100644
--- a/playbooks/libvirt/openshift-cluster/templates/network.xml
+++ b/playbooks/libvirt/openshift-cluster/templates/network.xml
@@ -1,5 +1,5 @@
 <network>
-  <name>openshift-ansible</name>
+  <name>{{ libvirt_network }}</name>
   <forward mode='nat'>
     <nat>
       <port start='1024' end='65535'/>
diff --git a/playbooks/libvirt/openshift-cluster/templates/storage-pool.xml b/playbooks/libvirt/openshift-cluster/templates/storage-pool.xml
new file mode 100644
index 000000000..da139afd0
--- /dev/null
+++ b/playbooks/libvirt/openshift-cluster/templates/storage-pool.xml
@@ -0,0 +1,6 @@
+<pool type='dir'>
+  <name>{{ libvirt_storage_pool }}</name>
+  <target>
+    <path>{{ libvirt_storage_pool_path }}</path>
+  </target>
+</pool>
-- 
cgit v1.2.3