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>
(cherry picked from commit 273413186a0042e66612a2d68b8aaaf17b50b5e1)

diff --git a/roles/ceph-mds/tasks/containerized.yml b/roles/ceph-mds/tasks/containerized.yml
index e10725a46de91f58a0acf3f7f83ffab868ce3e18..08c4b0e790e3e44cec9abb34969c353a35d67641 100644 (file)
--- a/roles/ceph-mds/tasks/containerized.yml
+++ b/roles/ceph-mds/tasks/containerized.yml
@@ -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
   include_tasks: systemd.yml
 
@@ -15,7 +11,7 @@
     daemon_reload: yes
 
 - 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
   register: multi_mds_socket
   retries: 5

diff --git a/roles/ceph-mds/tasks/main.yml b/roles/ceph-mds/tasks/main.yml
index a537597306349fc990718bdd6bbddf7d1eaa05e8..f6ff200f3ee9324b625f9a4176bbf489d8a35ce8 100644 (file)
--- a/roles/ceph-mds/tasks/main.yml
+++ b/roles/ceph-mds/tasks/main.yml
@@ -5,11 +5,6 @@
     - inventory_hostname == groups[mds_group_name] | first
     - 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
   include_tasks: common.yml
 

diff --git a/roles/ceph-nfs/tasks/pre_requisite_container.yml b/roles/ceph-nfs/tasks/pre_requisite_container.yml
index 1cda5ef25de18969d4427bc689e6b4953f507e6d..2c96d65239782b1c41d6fea960ce734ce9c0f1b9 100644 (file)
--- a/roles/ceph-nfs/tasks/pre_requisite_container.yml
+++ b/roles/ceph-nfs/tasks/pre_requisite_container.yml
@@ -2,7 +2,7 @@
 - name: keyring related tasks
   block:
     - 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
       with_items:
         - { name: "client.bootstrap-rgw", path: "/var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring", copy_key: true }

diff --git a/roles/ceph-nfs/tasks/pre_requisite_non_container.yml b/roles/ceph-nfs/tasks/pre_requisite_non_container.yml
index 0c497f6a9f95138a456816318fd65ddfcfdb6385..c85e4e0189a54a7c69d3a6507a0fbd1320dabaa5 100644 (file)
--- a/roles/ceph-nfs/tasks/pre_requisite_non_container.yml
+++ b/roles/ceph-nfs/tasks/pre_requisite_non_container.yml
@@ -47,7 +47,7 @@
     - groups.get(mon_group_name, []) | length > 0
   block:
     - 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
       with_items:
         - { name: "client.bootstrap-rgw", path: "/var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring", copy_key: true }