update osd default vars

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

diff --git a/group_vars/osds.sample b/group_vars/osds.sample
index d77d423291be0eb97d05bee2f5bd6a70dd204614..a6ba6d678be3d05459d0ed478195b2539d906c20 100644 (file)
--- a/group_vars/osds.sample
+++ b/group_vars/osds.sample
@@ -131,7 +131,7 @@ dummy:
 #osd_containerized_deployment_with_kv: false
 #kv_type: etcd
 #kv_endpoint: 127.0.0.1
-#ceph_osd_docker_prepare_env: ""
+#ceph_osd_docker_prepare_env: "OSD_FORCE_ZAP=1"
 #ceph_osd_docker_username: ceph
 #ceph_osd_docker_imagename: daemon
 #ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK" # comma separated variables

diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml
index 68eeca5cc6dd0b3475cdf63efcf8dfead5ed2239..7f2c9a2c36be7001496a5c301cf905c7f7402e54 100644 (file)
--- a/roles/ceph-osd/defaults/main.yml
+++ b/roles/ceph-osd/defaults/main.yml
@@ -123,7 +123,7 @@ osd_containerized_deployment: false
 osd_containerized_deployment_with_kv: false
 kv_type: etcd
 kv_endpoint: 127.0.0.1
-ceph_osd_docker_prepare_env: ""
+ceph_osd_docker_prepare_env: "OSD_FORCE_ZAP=1"
 ceph_osd_docker_username: ceph
 ceph_osd_docker_imagename: daemon
 ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK" # comma separated variables