Place "when: restapi" in site.yml

diff --git a/roles/ceph-restapi/tasks/main.yml b/roles/ceph-restapi/tasks/main.yml
index 01820fa7f3a314141220f900e3a58a6a70ba4315..5bf69816fb6c58342d1751d44f2cc0dca8bdef43 100644 (file)
--- a/roles/ceph-restapi/tasks/main.yml
+++ b/roles/ceph-restapi/tasks/main.yml
@@ -1,14 +1,12 @@
 ---
 - include: pre_requisite.yml
-  when: restapi
 
 - name: Check if Ceph REST API is already started
   shell: "ps aux|grep [c]eph-rest-api"
   register: restapi_status
-  when: restapi
   ignore_errors: True
 
 - name: Start Ceph REST API
   shell: "nohup ceph-rest-api &"
-  when: restapi and restapi_status.rc != 0
+  when: restapi_status.rc != 0
   changed_when: False

diff --git a/site.yml b/site.yml
index e7d10b0d7d707e76af8c4b5545b7da4fde36fe39..72704be593a51107aa46e05ccf2b002abb55b9ff 100644 (file)
--- a/site.yml
+++ b/site.yml
@@ -14,7 +14,7 @@
   sudo: True
   roles:
   - ceph-mon
-  - ceph-restapi
+  - { role: ceph-restapi, when: restapi }
 
 - hosts: osds
   sudo: True