ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 91bf53ee93
    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>
pull/2952/head v3.1.0rc12
Mike Christie 2018-07-26 13:30:36 -05:00 committed by mergify[bot]
parent 154b1dcc74
commit 04ec87f31b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/ceph-iscsi-gw/tasks/configure_iscsi.yml
View File

@ -14,6 +14,12 @@
when: "'rbd' not in (rbd_pool_exists.stdout | from_json)" when: "'rbd' not in (rbd_pool_exists.stdout | from_json)"
delegate_to: "{{ groups[mon_group_name][0] }}" 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) - name: igw_gateway (tgt) | configure iscsi target (gateway)
igw_gateway: igw_gateway:
mode: "target" mode: "target"

6
roles/ceph-iscsi-gw/tasks/prerequisites.yml
View File

@ -65,12 +65,6 @@
- target.stat.exists - target.stat.exists
- target.stat.islnk == False - 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 - name: copy admin key
copy: copy:
src: "{{ fetch_directory }}/{{ fsid }}/etc/ceph/{{ cluster }}.client.admin.keyring" src: "{{ fetch_directory }}/{{ fsid }}/etc/ceph/{{ cluster }}.client.admin.keyring"