From: Sébastien Han <seb@redhat.com>
Date: Wed, 2 Mar 2016 13:52:00 +0000 (+0100)
Subject: docker: fix group_vars file
X-Git-Tag: v1.0.3~11^2~12
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3e87da0f16ded93da7281f7983c9564ac250eca2;p=ceph-ansible.git

docker: fix group_vars file

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/group_vars/all.docker.sample b/group_vars/all.docker.sample
index 21fe01ea9..c0d84362e 100644
--- a/group_vars/all.docker.sample
+++ b/group_vars/all.docker.sample
@@ -1,28 +1,52 @@
 ---
 dummy:
-cephx_require_signatures: false # Kernel RBD does NOT support signatures!
-cephx_cluster_require_signatures: false
-restapi_group_name: restapis
-fetch_directory: fetch/
-mon_containerized_deployment: true
-mon_docker_privileged: true
-ceph_mon_docker_username: hchen
-ceph_mon_docker_imagename: rhceph
-ceph_mon_docker_interface: "{{ monitor_interface }}"
-ceph_mon_docker_subnet: "{{ public_network }}" # subnet of the ceph_mon_docker_interface
-ceph_mon_extra_envs: "MON_NAME={{ ansible_hostname }}" # comma separated variables
-osd_containerized_deployment: true
-ceph_osd_docker_username: hchen
-ceph_osd_docker_imagename: rhceph
-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
-rgw_containerized_deployment: true
-ceph_rgw_docker_username: hchen
-ceph_rgw_docker_imagename: rhceph
-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
 
+#######
+# MON #
+#######
+#mon_containerized_deployment: true
+#mon_docker_privileged: true
+#ceph_mon_docker_username: ceph
+#ceph_mon_docker_imagename: daemon
+#ceph_mon_docker_interface: "{{ monitor_interface }}"
+#ceph_mon_docker_subnet: "{{ public_network }}" # subnet of the ceph_mon_docker_interface
+#ceph_mon_extra_envs: "MON_NAME={{ ansible_hostname }}" # comma separated variables
 
+#######
+# OSD #
+#######
+#osd_containerized_deployment: true
+#ceph_osd_docker_username: ceph
+#ceph_osd_docker_imagename: daemon
+#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
+# - /dev/sdc
 
+#######
+# MDS #
+#######
+#mds_containerized_deployment: false
+#ceph_mds_docker_username: ceph
+#ceph_mds_docker_imagename: daemon
+#ceph_mds_docker_extra_env: "MDS_NAME={{ ansible_hostname }}" # comma separated variables
+
+#######
+# RGW #
+#######
+#rgw_containerized_deployment: true
+#ceph_rgw_docker_username: ceph
+#ceph_rgw_docker_imagename: daemon
+#ceph_rgw_civetweb_port: 80
+#ceph_rgw_docker_extra_env: "RGW_CIVETWEB_PORT={{ ceph_rgw_civetweb_port }}" # comma separated variables
+
+###########
+# RESTAPI #
+###########
+#restapi_containerized_deployment: false
+#ceph_restapi_docker_interface: eth0
+#ceph_restapi_port: 5000
+#ceph_restapi_docker_username: ceph
+#ceph_restapi_docker_imagename: daemon
+#ceph_restapi_docker_extra_env: "RESTAPI_IP=0.0.0.0" # comma separated variables