From: Mike Christie <mchristi@redhat.com>
Date: Thu, 26 Jul 2018 18:30:36 +0000 (-0500)
Subject: ceph ansible 3.1 igw: fix rbd-target-gw startup
X-Git-Tag: v3.1.0rc12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=04ec87f31b37cf8d69cbd09b1bfbd7b4ac71b999;p=ceph-ansible.git

ceph ansible 3.1 igw: fix rbd-target-gw startup

The problem is rbd-target-gw needs the rbd pool to be created, keyring
to be copied over, and the iscsi-gateway.cfg to be setup before starting
the rbd-target-gw service.

In the master branch this is fixed by this commit:

    commit 91bf53ee932a6748c464bea762f8fb6f07f11347
    Author: Sébastien Han <seb@redhat.com>
    Date:   Fri Mar 23 11:24:56 2018 +0800

        ceph-iscsi: support for containerize deployment

where the needed setup tasks are done in common.yml which is done
before prerequisites.yml.

To avoid porting all those changes to 3.1 this patch just moves the
rbd-target-gw startup to configure_iscsi.yml after everything has
been setup.

This fixes red hat bz:

https://bugzilla.redhat.com/show_bug.cgi?id=1601325

Signed-off-by: Mike Christie <mchristi@redhat.com>
---

diff --git a/roles/ceph-iscsi-gw/tasks/configure_iscsi.yml b/roles/ceph-iscsi-gw/tasks/configure_iscsi.yml
index 22ec4d396..a5a600448 100644
--- a/roles/ceph-iscsi-gw/tasks/configure_iscsi.yml
+++ b/roles/ceph-iscsi-gw/tasks/configure_iscsi.yml
@@ -14,6 +14,12 @@
   when: "'rbd' not in (rbd_pool_exists.stdout | from_json)"
   delegate_to: "{{ groups[mon_group_name][0] }}"
 
+- name: enable the rbd-target-gw service and make sure it is running
+  service:
+    name: rbd-target-gw
+    enabled: yes
+    state: started
+
 - name: igw_gateway (tgt) | configure iscsi target (gateway)
   igw_gateway:
     mode: "target"
diff --git a/roles/ceph-iscsi-gw/tasks/prerequisites.yml b/roles/ceph-iscsi-gw/tasks/prerequisites.yml
index ba9ae435e..16ea03633 100644
--- a/roles/ceph-iscsi-gw/tasks/prerequisites.yml
+++ b/roles/ceph-iscsi-gw/tasks/prerequisites.yml
@@ -65,12 +65,6 @@
     - target.stat.exists
     - target.stat.islnk == False
 
-- name: enable the rbd-target-gw service and make sure it is running
-  service:
-    name: rbd-target-gw
-    enabled: yes
-    state: started
-
 - name: copy admin key
   copy:
     src: "{{ fetch_directory }}/{{ fsid }}/etc/ceph/{{ cluster }}.client.admin.keyring"