ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

common: do not reset `container_exec_cmd` 

This commit removes some legacy tasks.

These tasks aren't needed, they cause the playbook to fail when
collocating daemons.

Closes: #4553

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/4591/head
Guillaume Abrioux 2019-10-08 10:38:39 +02:00 committed by Dimitri Savineau
parent 80e2d00b16
commit 273413186a
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/ceph-mds/tasks/containerized.yml
View File

@ -1,8 +1,4 @@
--- ---
- name: set_fact container_exec_cmd mds
set_fact:
container_exec_cmd: "{{ container_binary }} exec ceph-mds-{{ ansible_hostname }}"
- name: include_tasks systemd.yml - name: include_tasks systemd.yml
include_tasks: systemd.yml include_tasks: systemd.yml
@ -15,7 +11,7 @@
daemon_reload: yes daemon_reload: yes
- name: wait for mds socket to exist - name: wait for mds socket to exist
command: "{{ container_exec_cmd }} sh -c 'stat /var/run/ceph/{{ cluster }}-mds.{{ ansible_hostname }}.asok || stat /var/run/ceph/{{ cluster }}-mds.{{ ansible_fqdn }}.asok'" command: "{{ container_binary }} exec ceph-mds-{{ ansible_hostname }} sh -c 'stat /var/run/ceph/{{ cluster }}-mds.{{ ansible_hostname }}.asok || stat /var/run/ceph/{{ cluster }}-mds.{{ ansible_fqdn }}.asok'"
changed_when: false changed_when: false
register: multi_mds_socket register: multi_mds_socket
retries: 5 retries: 5

5
roles/ceph-mds/tasks/main.yml
View File

@ -5,11 +5,6 @@
- inventory_hostname == groups[mds_group_name] | first - inventory_hostname == groups[mds_group_name] | first
- not rolling_update | bool - not rolling_update | bool
- name: set_fact container_exec_cmd
set_fact:
container_exec_cmd: "{{ container_binary }} exec ceph-mds-{{ ansible_hostname }}"
when: containerized_deployment | bool
- name: include common.yml - name: include common.yml
include_tasks: common.yml include_tasks: common.yml

2
roles/ceph-nfs/tasks/pre_requisite_container.yml
View File

@ -2,7 +2,7 @@
- name: keyring related tasks - name: keyring related tasks
block: block:
- name: get keys from monitors - name: get keys from monitors
command: "{{ hostvars[groups.get(mon_group_name)[0]]['container_exec_cmd'] | default('') }} ceph --cluster {{ cluster }} auth get {{ item.name }}" command: "{{ hostvars[groups.get(mon_group_name)[0]]['container_exec_cmd'] }} ceph --cluster {{ cluster }} auth get {{ item.name }}"
register: _rgw_keys register: _rgw_keys
with_items: with_items:
- { name: "client.bootstrap-rgw", path: "/var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring", copy_key: true } - { name: "client.bootstrap-rgw", path: "/var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring", copy_key: true }

2
roles/ceph-nfs/tasks/pre_requisite_non_container.yml
View File

@ -47,7 +47,7 @@
- groups.get(mon_group_name, []) | length > 0 - groups.get(mon_group_name, []) | length > 0
block: block:
- name: get keys from monitors - name: get keys from monitors
command: "{{ container_exec_cmd }} ceph --cluster {{ cluster }} auth get {{ item.name }}" command: "ceph --cluster {{ cluster }} auth get {{ item.name }}"
register: _rgw_keys register: _rgw_keys
with_items: with_items:
- { name: "client.bootstrap-rgw", path: "/var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring", copy_key: true } - { name: "client.bootstrap-rgw", path: "/var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring", copy_key: true }