From: Huamin Chen <hchen@redhat.com>
Date: Fri, 17 Jun 2016 16:59:53 +0000 (+0000)
Subject: fix rgw containerized deployment
X-Git-Tag: v1.0.6~85^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=18e7e72deb5f5db9938da91d298a653f9d4c060e;p=ceph-ansible.git

fix rgw containerized deployment

Signed-off-by: Huamin Chen <hchen@redhat.com>
---

diff --git a/roles/ceph-rgw/tasks/docker/start_docker_rgw.yml b/roles/ceph-rgw/tasks/docker/start_docker_rgw.yml
index dffa83e36..452770267 100644
--- a/roles/ceph-rgw/tasks/docker/start_docker_rgw.yml
+++ b/roles/ceph-rgw/tasks/docker/start_docker_rgw.yml
@@ -8,34 +8,26 @@
     owner: "root"
     group: "root"
     mode: "0644"
-  when:
-    is_atomic or
-    ansible_os_family == 'CoreOS'
+  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: link systemd unit file for rgw instance
   file:
     src: /var/lib/ceph/ceph-rgw@.service
     dest: /etc/systemd/system/multi-user.target.wants/ceph-rgw@{{ ansible_hostname }}.service
     state: link
-  when:
-    is_atomic or
-    ansible_os_family == 'CoreOS'
+  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: enable systemd unit file for rgw instance
   shell: systemctl enable /etc/systemd/system/multi-user.target.wants/ceph-rgw@{{ ansible_hostname }}.service
   failed_when: false
   changed_when: false
-  when:
-    is_atomic or
-    ansible_os_family == 'CoreOS'
+  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: reload systemd unit files
   shell: systemctl daemon-reload
   changed_when: false
   failed_when: false
-  when:
-    is_atomic or
-    ansible_os_family == 'CoreOS'
+  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: systemd start rgw container
   service:
@@ -43,9 +35,7 @@
     state: started
     enabled: yes
   changed_when: false
-  when:
-    is_atomic or
-    ansible_os_family == 'CoreOS'
+  when: ansible_os_family == 'RedHat' or ansible_os_family == 'CoreOS'
 
 - name: run the rados gateway docker image
   docker:
@@ -56,6 +46,4 @@
     state: running
     env: "CEPH_DAEMON=RGW,{{ ceph_rgw_docker_extra_env }}"
     volumes: "/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph"
-  when:
-    not is_atomic and
-    ansible_os_family != 'CoreOS'
+  when: ansible_os_family != 'RedHat' and ansible_os_family != 'CoreOS'