split osd disk to prepare and activate

Signed-off-by: Huamin Chen <hchen@redhat.com>

diff --git a/group_vars/all.docker b/group_vars/all.docker
index f0c57139b73db55129ae0798124e3ea6919946bd..12ae3738313b06cf526668c724d29346bd11a598 100644 (file)
--- a/group_vars/all.docker
+++ b/group_vars/all.docker
@@ -14,7 +14,8 @@ ceph_mon_extra_envs: "MON_NAME={{ ansible_hostname }}" # comma separated variabl
 osd_containerized_deployment: true
 ceph_osd_docker_username: hchen
 ceph_osd_docker_imagename: rhceph
-ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK,OSD_FORCE_ZAP=1" # comma separated variables
+ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK_ACTIVATE" # comma separated variables
+ceph_osd_docker_prepare_env: "CEPH_DAEMON=OSD_CEPH_DISK_PREPARE,OSD_FORCE_ZAP=1" # comma separated variables
 ceph_osd_docker_devices:
  - /dev/sdb
 rgw_containerized_deployment: true
@@ -24,3 +25,6 @@ ceph_rgw_civetweb_port: 80
 ceph_rgw_docker_extra_env: "RGW_CIVETWEB_PORT={{ ceph_rgw_civetweb_port }}" # comma separated variables
 rbd_client_directories: false
 ceph_stable_release: hammer
+
+
+

diff --git a/roles/ceph-mon/tasks/ceph_keys.yml b/roles/ceph-mon/tasks/ceph_keys.yml
index 00c7168956c64416507f94b2e2f50f2dfd3407c8..c9ddc68541668ae4e4b936ecb5e27de3e3d75e4f 100644 (file)
--- a/roles/ceph-mon/tasks/ceph_keys.yml
+++ b/roles/ceph-mon/tasks/ceph_keys.yml
@@ -15,8 +15,6 @@
     not mon_containerized_deployment and
     groups[restapi_group_name] is defined
 
-- debug: msg="host {{ inventory_hostname }} last {{ groups.mons|last }}"
-
 - name: create ceph rest api keyring when mon is containerized
   command: docker exec {{ ansible_hostname }} ceph auth get-or-create client.restapi osd 'allow *' mon 'allow *' -o /etc/ceph/ceph.client.restapi.keyring
   args:

diff --git a/roles/ceph-osd/tasks/docker/start_docker_osd.yml b/roles/ceph-osd/tasks/docker/start_docker_osd.yml
index 64fccae03ec42c8c9f18f41984a1de0e8e6449ef..43a93f91d2857faf77232b54066a2a34f8d0543f 100644 (file)
--- a/roles/ceph-osd/tasks/docker/start_docker_osd.yml
+++ b/roles/ceph-osd/tasks/docker/start_docker_osd.yml
@@ -3,6 +3,19 @@
 - name: pull ceph daemon image
   shell: "docker pull {{ ceph_mon_docker_username }}/{{ ceph_mon_docker_imagename }}"
 
+- name: prepare ceph osd disk
+  docker:
+    image: "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}"
+    name: "{{ ansible_hostname }}-osd-prepare-{{ item | regex_replace('/', '') }}"
+    net: host
+    pid: host
+    state: running
+    privileged: yes
+    env: "OSD_DEVICE={{ item }},{{ ceph_osd_docker_prepare_env }}"
+    volumes: "/var/lib/ceph:/var/lib/ceph,/etc/ceph:/etc/ceph,/dev/:/dev/"
+  with_items: ceph_osd_docker_devices
+  when: ceph_osd_docker_prepare_env is defined
+
 - name: run the ceph osd docker image
   docker:
     image: "{{ ceph_osd_docker_username }}/{{ ceph_osd_docker_imagename }}"