From 0d704b571045e260255a945b01a1f1d2b8100602 Mon Sep 17 00:00:00 2001
From: Huamin Chen <hchen@redhat.com>
Date: Thu, 21 Jan 2016 17:22:46 +0000
Subject: [PATCH] copy bootstrap keyring and conf from mon to ansible server,
 so osd can get them to bootstrap

Signed-off-by: Huamin Chen <hchen@redhat.com>
---
 roles/ceph-mon/tasks/docker/fetch_configs.yml |  3 ++-
 .../tasks/docker/start_docker_monitor.yml     | 27 ++++++++++++++++---
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/roles/ceph-mon/tasks/docker/fetch_configs.yml b/roles/ceph-mon/tasks/docker/fetch_configs.yml
index 48438dfac..46384d009 100644
--- a/roles/ceph-mon/tasks/docker/fetch_configs.yml
+++ b/roles/ceph-mon/tasks/docker/fetch_configs.yml
@@ -2,6 +2,7 @@
 - name: set config and keys paths
   set_fact:
     ceph_config_keys:
+      - /etc/ceph/ceph.conf
       - /etc/ceph/ceph.client.admin.keyring
       - /etc/ceph/monmap
       - /etc/ceph/ceph.mon.keyring
@@ -19,7 +20,7 @@
 
 - name: try to fetch ceph config and keys
   copy:
-    src: "{{ playbook_dir }}/{{ fetch_directory }}/{{ fsid }}/{{ item.0 }}"
+    src: "{{ playbook_dir }}/{{ fetch_directory }}/docker_mon_files/{{ item.0 }}"
     dest: "{{ item.0 }}"
     owner: root
     group: root
diff --git a/roles/ceph-mon/tasks/docker/start_docker_monitor.yml b/roles/ceph-mon/tasks/docker/start_docker_monitor.yml
index 3d962822d..386f4ab54 100644
--- a/roles/ceph-mon/tasks/docker/start_docker_monitor.yml
+++ b/roles/ceph-mon/tasks/docker/start_docker_monitor.yml
@@ -1,4 +1,12 @@
 ---
+- name: set config and keys paths
+  set_fact:
+      ceph_bootstrap_config_keys:
+          - /etc/ceph/ceph.conf
+          - /var/lib/ceph/bootstrap-osd/ceph.keyring
+          - /var/lib/ceph/bootstrap-rgw/ceph.keyring
+          - /var/lib/ceph/bootstrap-mds/ceph.keyring
+                                                
 - name: pull ceph daemon image
   shell: "docker pull {{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}"
 
@@ -11,9 +19,22 @@
     env: "MON_IP={{ hostvars[inventory_hostname]['ansible_' + ceph_mon_docker_interface]['ipv4']['address'] }},CEPH_DAEMON=MON,CEPH_PUBLIC_NETWORK={{ ceph_mon_docker_subnet }},{{ ceph_mon_extra_envs }}"
     volumes: "/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph"
 
-- name: fetch ceph.conf from mon
+
+- name: stat for ceph config and keys
+  stat: path="{{ item }}"
+  with_items: ceph_bootstrap_config_keys
+  changed_when: false
+  failed_when: false
+  register: statmonconfig
+
+- name: fetch boostrap keys and conf from mon
   fetch:
-     dest: "{{ playbook_dir }}/{{ fetch_directory }}/{{ fsid}}/etc/ceph/ceph.conf"
-     src: /etc/ceph/ceph.conf
+     dest: "{{ playbook_dir }}/{{ fetch_directory }}/{{ fsid }}/{{ item.0 }}"
+     src: "{{ item.0 }}"
      flat: yes
+  with_together:
+    - ceph_bootstrap_config_keys
+    - statmonconfig.results
+  when: item.1.stat.exists == true
+            
                                     
\ No newline at end of file
-- 
2.47.3