switch_to_containers: support multiple rgw instances per host

add multiple rgw instances per host in switch_to_containers playbook.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/3594/head
Guillaume Abrioux 2019-02-12 14:03:39 +01:00 committed by Sébastien Han
parent 70f1eea9b2
commit 69310a5cd6
1 changed files with 12 additions and 12 deletions

View File

@ -421,18 +421,6 @@
serial: 1 serial: 1
become: true become: true
pre_tasks: pre_tasks:
- name: stop non-containerized ceph rgw(s)
service:
name: "ceph-radosgw@rgw.{{ ansible_hostname }}"
state: stopped
enabled: no
- name: remove old systemd unit file
file:
path: /usr/lib/systemd/system/ceph-radosgw@.service
state: absent
- set_fact: - set_fact:
ceph_uid: 64045 ceph_uid: 64045
when: ceph_docker_image_tag | string is match("latest") or ceph_docker_image_tag | string is search("ubuntu") when: ceph_docker_image_tag | string is match("latest") or ceph_docker_image_tag | string is search("ubuntu")
@ -457,6 +445,18 @@
- import_role: - import_role:
name: ceph-facts name: ceph-facts
- name: stop non-containerized ceph rgw(s)
service:
name: "ceph-radosgw@rgw.{{ ansible_hostname }}.{{ item.instance_name }}"
state: stopped
enabled: no
with_items: "{{ rgw_instances }}"
- name: remove old systemd unit file
file:
path: /usr/lib/systemd/system/ceph-radosgw@.service
state: absent
- import_role: - import_role:
name: ceph-handler name: ceph-handler