From: Sébastien Han Date: Thu, 31 Aug 2017 06:29:30 +0000 (+0200) Subject: rgw: cleanup old code and remove systemd condition X-Git-Tag: v3.0.0rc5~2^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7ccd10a15e9adaca9ca45dff493c195e1416e0db;p=ceph-ansible.git rgw: cleanup old code and remove systemd condition Remove the old check prior systemd. We only support systemd so there is no need to run a condition on systemd. The playbook will fail if systemd is not present. Signed-off-by: Sébastien Han --- diff --git a/roles/ceph-rgw/tasks/start_radosgw.yml b/roles/ceph-rgw/tasks/start_radosgw.yml index 96e806fe9..cdb40666e 100644 --- a/roles/ceph-rgw/tasks/start_radosgw.yml +++ b/roles/ceph-rgw/tasks/start_radosgw.yml @@ -1,18 +1,10 @@ --- -- name: check if rgw is started - command: /etc/init.d/radosgw status - register: rgwstatus - changed_when: false - failed_when: false - always_run: true - - name: ensure systemd service override directory exists file: state: directory path: "/etc/systemd/system/ceph-rgw@.service.d/" when: - ceph_rgw_systemd_overrides is defined - - ansible_service_mgr == 'systemd' - name: add ceph-rgw systemd service overrides config_template: @@ -22,7 +14,6 @@ config_type: "ini" when: - ceph_rgw_systemd_overrides is defined - - ansible_service_mgr == 'systemd' - name: start rgw service: