From d0947f0fcfa46abe116a616be2da4b0da667b1f1 Mon Sep 17 00:00:00 2001
From: Andy McCrae <andy.mccrae@gmail.com>
Date: Thu, 30 Aug 2018 08:53:36 +0100
Subject: [PATCH] Dont run client dummy container on non-x86_64 hosts

The dummy client container currently wont work on non-x86_64 hosts.
This PR creates a filtered client group that contains only hosts
that are x86_64 - which can then be the group to run the
dummy container against.

This is for the specific case of a containerized_deployment where
there is a mixture of non-x86_64 hosts and x86_64 hosts. As such
the filtered group will contain all hosts when running with
containerized_deployment: false.

Currently ppc64le is not supported for Ceph server components.

Signed-off-by: Andy McCrae <andy.mccrae@gmail.com>
(cherry picked from commit 772e6b9be20ce82d3b8f9ffdf6b7bc4f6be842b8)
---
 roles/ceph-client/tasks/create_users_keys.yml | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/roles/ceph-client/tasks/create_users_keys.yml b/roles/ceph-client/tasks/create_users_keys.yml
index ca7e49364..64e01d913 100644
--- a/roles/ceph-client/tasks/create_users_keys.yml
+++ b/roles/ceph-client/tasks/create_users_keys.yml
@@ -12,6 +12,19 @@
   when:
     - keys_tmp is defined
 
+# dummy container setup is only supported on x86_64
+# when running with containerized_deployment: true this task
+# creates a group that contains only x86_64 hosts.
+# when running with containerized_deployment: false this task
+# will add all client hosts to the group (and not filter).
+- name: create filtered clients group
+  add_host:
+    name: "{{ item }}"
+    groups: _filtered_clients
+  with_items: "{{ groups[client_group_name] }}"
+  when:
+    - (hostvars[item]['ansible_architecture'] == 'x86_64') or (not containerized_deployment)
+
 - name: run a dummy container (sleep 300) from where we can create pool(s)/key(s)
   command: >
     docker run \
@@ -25,7 +38,7 @@
   changed_when: false
   when:
     - containerized_deployment
-    - inventory_hostname == groups.get(client_group_name) | first
+    - inventory_hostname == groups.get('_filtered_clients') | first
 
 - name: set_fact delegated_node
   set_fact:
@@ -57,7 +70,7 @@
   when:
     - cephx
     - keys | length > 0
-    - inventory_hostname == groups.get(client_group_name) | first
+    - inventory_hostname == groups.get('_filtered_clients') | first
 
 - name: slurp client cephx key(s)
   slurp:
@@ -69,7 +82,7 @@
   when:
     - cephx
     - keys | length > 0
-    - inventory_hostname == groups.get(client_group_name) | first
+    - inventory_hostname == groups.get('_filtered_clients') | first
 
 - name: list existing pool(s)
   command: >
@@ -81,7 +94,7 @@
   delegate_to: "{{ delegated_node }}"
   when:
     - condition_copy_admin_key
-    - inventory_hostname == groups.get(client_group_name, []) | first
+    - inventory_hostname == groups.get('_filtered_clients', []) | first
 
 - name: create ceph pool(s)
   command: >
@@ -103,7 +116,7 @@
   when:
     - pools | length > 0
     - condition_copy_admin_key
-    - inventory_hostname in groups.get(client_group_name) | first
+    - inventory_hostname in groups.get('_filtered_clients') | first
     - item.1.rc != 0
 
 - name: get client cephx keys
@@ -114,6 +127,6 @@
     owner: "{{ ceph_uid }}"
     group: "{{ ceph_uid }}"
   with_items:
-    - "{{ hostvars[groups[client_group_name][0]]['slurp_client_keys']['results'] }}"
+    - "{{ hostvars[groups['_filtered_clients'][0]]['slurp_client_keys']['results'] }}"
   when:
     - not item.get('skipped', False)