fix rgw containerized deployment

Signed-off-by: Huamin Chen <hchen@redhat.com>
pull/852/head
Huamin Chen 2016-06-17 16:59:53 +00:00
parent 638abfb497
commit 18e7e72deb
1 changed files with 6 additions and 18 deletions

View File

@ -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'