From c260d3d91b9041e6686743b399f59fae00210058 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Thu, 9 Apr 2015 11:05:24 +0000
Subject: cinder: Configure cinder dependencies when configuring cinder

---
 openstack/usr/share/openstack/cinder.yml | 45 +++++++++++++++++++++++++++++---
 1 file changed, 41 insertions(+), 4 deletions(-)

diff --git a/openstack/usr/share/openstack/cinder.yml b/openstack/usr/share/openstack/cinder.yml
index 9a1930b4..2bbb5ed1 100644
--- a/openstack/usr/share/openstack/cinder.yml
+++ b/openstack/usr/share/openstack/cinder.yml
@@ -3,6 +3,47 @@
   vars_files:
   - "/etc/openstack/cinder.conf"
   tasks:
+
+  - name: Check that CINDER_DEVICE exists
+    stat:
+        path: /dev/{{ CINDER_DEVICE }}
+    register: cinder_device_stats
+    failed_when: cinder_device_stats.stat.exists == false
+
+  - name: Configure LVM group for cinder
+    lvg:
+        vg: cinder-volumes
+        pvs: /dev/{{ CINDER_DEVICE }}
+
+  - lineinfile:
+        dest: /etc/lvm/lvm.conf
+        regexp: '# filter = \[ \"a\/\.\*/\" \]'
+        line:    '    filter = [ "a/{{ CINDER_DEVICE }}/", "r/.*/" ]'
+        backrefs: yes
+
+  - name: generate InitiatorName for iscsi
+    shell: iscsi-iname
+    register: initiator_name
+
+  - lineinfile:
+        dest: /etc/iscsi/initiatorname.iscsi
+        regexp: '^InitiatorName=$'
+        line:    'InitiatorName={{ initiator_name.stdout }}'
+        backrefs: yes
+
+  - name: Update kernel module dependencies
+    command: depmod -a
+
+  - name: Enable and start iscsid and target services
+    service:
+        name: "{{ item }}"
+        enabled: yes
+        state: started
+    with_items:
+    - lvm2-lvmetad
+    - target
+    - iscsid
+
   - name: Create the cinder user.
     user:
         name: cinder
@@ -100,7 +141,3 @@
     - openstack-cinder-scheduler
     - openstack-cinder-volume
     - openstack-cinder-backup
-
-  - lvg:
-        vg: cinder-volumes
-        pvs: "{{ CINDER_DEVICE }}"
-- 
cgit v1.2.1