From 9f0152e2e4470ae205f16d30b7b07433525a15a3 Mon Sep 17 00:00:00 2001
From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 14 Jun 2021 12:25:16 -0700
Subject: [PATCH] test

Fixes #62
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---
 cephadm.yml | 42 +++++++++++++++++++-----------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/cephadm.yml b/cephadm.yml
index 3e714b6..b28abfa 100644
--- a/cephadm.yml
+++ b/cephadm.yml
@@ -85,7 +85,7 @@
     shell: ceph config set global mon_cluster_log_to_stderr false
 
 
-- hosts: mons mgrs osds mdss grafana-servers
+- hosts: mons mgrs osds mdss grafana-servers clients
   become: yes
   tasks:
   - name: fetch ceph.pub
@@ -104,11 +104,7 @@
     register: myhostname
 
   - name: add hostname to cephadm
-    shell: ceph orch host add "{{ myhostname.stdout }}" "{{ ansible_ssh_host }}"
-    delegate_to: mon-000
-
-  - name: label host
-    shell: ceph orch host label add "{{ myhostname.stdout }}" "{{ ceph_group }}"
+    shell: ceph orch host add "{{ myhostname.stdout }}" "{{ ansible_ssh_host }}" --labels {{ ceph_group }}{{ ',_no_schedule' if 'clients' in group_names else '' }}{{ ',_admin' if 'mons' in group_names else '' }}
     delegate_to: mon-000
 
 - hosts: mon-000
@@ -137,23 +133,23 @@
     shell: ceph orch apply mds all --placement=label:mdss
     when: groups['mdss'] | default([]) | length > 0
 
-- hosts: all
-  become: yes
-  tasks:
-  - name: generate min config
-    shell: ceph config generate-minimal-conf
-    delegate_to: mon-000
-    register: minimal_config
-    run_once: true
-
-  - name: setup config
-    copy:
-      # yay ansible bug: https://github.com/ansible/ansible/issues/6077
-      content: "{{ minimal_config.stdout }}\n"
-      dest: /etc/ceph/ceph.conf
-      owner: root
-      group: root
-      mode: 0644
+#- hosts: all
+#  become: yes
+#  tasks:
+#  - name: generate min config
+#    shell: ceph config generate-minimal-conf
+#    delegate_to: mon-000
+#    register: minimal_config
+#    run_once: true
+#
+#  - name: setup config
+#    copy:
+#      # yay ansible bug: https://github.com/ansible/ansible/issues/6077
+#      content: "{{ minimal_config.stdout }}\n"
+#      dest: /etc/ceph/ceph.conf
+#      owner: root
+#      group: root
+#      mode: 0644
 
 
 - hosts: clients