Add more common options

Extend settings support.

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index fbbb68116ff52e1e1d0841bbdeec5caa710553e1..6fe4636ca08e56910da595e0740cb05e437ec47c 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -14,20 +14,21 @@ redhat_distro: el6 # supported distros are el6, rhel6, f18, f19, opensuse12.2, s
 ## Ceph options
 #
 cephx: true
+cephx_require_signatures: true
+cephx_cluster_require_signatures: true
+cephx_service_require_signatures: false
+disable_in_memory_logs: true
+
 ## Monitor options
 #
 monitor_interface: eth1
 mon_osd_down_out_interval: 600
 mon_osd_min_down_reporters: 7 # number of OSDs per host + 1
-
-## MDS options
-#
-mds: true # disable mds configuration in ceph.conf
-
-# Rados Gateway options
-#
-radosgw: true # referenced in mon role too.
-#radosgw_dns_name: your.subdomain.tld # subdomains used by radosgw. See http://ceph.com/docs/master/radosgw/config/#enabling-subdomain-s3-calls
+mon_clock_drift_allowed: .15
+mon_clock_drift_warn_backoff: 30
+mon_osd_full_ratio: .95
+mon_osd_nearfull_ratio: .85
+mon_osd_report_timeout: 300
 
 ## OSD options
 #
@@ -38,16 +39,32 @@ pool_default_size: 2
 cluster_network: 192.168.0.0/24
 public_network: 192.168.0.0/24
 osd_mkfs_type: xfs
+osd_mkfs_options_xfs: -f -i size=2048
+osd_mount_options_xfs: noatime
 osd_mon_heartbeat_interval: 30
+# Object backend
+osd_objectstore: filestore
 # Performance tuning
 filestore_merge_threshold: 40
 filestore_split_multiple: 8
 osd_op_threads: 8
+filestore_op_threads: 8
+filestore_max_sync_interval: 5
+osd_max_scrubs: 1
 # Recovery tuning
 osd_recovery_max_active: 5
 osd_max_backfills: 2
 osd_recovery_op_priority: 2
 
+## MDS options
+#
+mds: true # disable mds configuration in ceph.conf
+
+# Rados Gateway options
+#
+radosgw: true # referenced in monitor role too.
+#radosgw_dns_name: your.subdomain.tld # subdomains used by radosgw. See http://ceph.com/docs/master/radosgw/config/#enabling-subdomain-s3-calls
+
 ## Testing mode
 # enable this mode _only_ when you have a single node
 # if you don't want it keep the option commented

diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2
index e1c2983aea469a41c61ae7d036cf981dfc9fe93f..0708f78b70d028609a019bef6b0d5f7cb51c56a7 100644 (file)
--- a/roles/ceph-common/templates/ceph.conf.j2
+++ b/roles/ceph-common/templates/ceph.conf.j2
@@ -5,6 +5,9 @@
   auth cluster required = cephx
   auth service required = cephx
   auth client required = cephx
+  cephx require signatures = {{ cephx_require_signatures }}
+  cephx cluster require signatures = {{ cephx_require_signatures }}
+  cephx service require signatures = {{ cephx_service_require_signatures }}
 {% else %}
   auth cluster required = none
   auth service required = none
@@ -12,25 +15,46 @@
   auth supported = none
 {% endif %}
   fsid = {{ fsid }}
-{% if pool_default_pg_num is defined %}
   osd pool default pg num = {{ pool_default_pg_num }}
-{% endif %}
-{% if pool_default_pgp_num is defined %}
   osd pool default pgp num = {{ pool_default_pgp_num }}
-{% endif %}
-{% if pool_default_size is defined %}
   osd pool default size = {{ pool_default_size }}
-{% endif %}
-{% if pool_default_min_size is defined %}
   osd pool default min size = {{ pool_default_min_size }}
-{% endif %}
-{% if pool_default_crush_rule is defined %}
   osd pool default crush rule = {{ pool_default_crush_rule }}
-{% endif %}
 {% if common_single_host_mode is defined %}
   osd crush chooseleaf type = 0
 {% endif %}
-
+{% if disable_in_memory_logs %}
+  # Disable in-memory logs
+  debug_lockdep = 0/0
+  debug_context = 0/0
+  debug_crush = 0/0
+  debug_buffer = 0/0
+  debug_timer = 0/0
+  debug_filer = 0/0
+  debug_objecter = 0/0
+  debug_rados = 0/0
+  debug_rbd = 0/0
+  debug_journaler = 0/0
+  debug_objectcatcher = 0/0
+  debug_client = 0/0
+  debug_osd = 0/0
+  debug_optracker = 0/0
+  debug_objclass = 0/0
+  debug_filestore = 0/0
+  debug_journal = 0/0
+  debug_ms = 0/0
+  debug_monc = 0/0
+  debug_tp = 0/0
+  debug_auth = 0/0
+  debug_finisher = 0/0
+  debug_heartbeatmap = 0/0
+  debug_perfcounter = 0/0
+  debug_asok = 0/0
+  debug_throttle = 0/0
+  debug_mon = 0/0
+  debug_paxos = 0/0
+  debug_rgw = 0/0
+{% endif %}
 [mon]
   mon osd down out interval = {{ mon_osd_down_out_interval }}
   mon osd min down reporters = {{ mon_osd_min_down_reporters }}
@@ -43,9 +67,9 @@
 {% endfor %}
 
 [osd]
-{% if osd_mkfs_type is defined %}
   osd mkfs type = {{ osd_mkfs_type }}
-{% endif %}
+  osd mkfs options xfs = {{ osd_mkfs_options_xfs }}
+  osd mount options xfs = {{ osd_mount_options_xfs }}
   osd journal size = {{ journal_size }}
 {% if cluster_network is defined %}
   cluster_network = {{ cluster_network }}
@@ -58,10 +82,14 @@
   filestore merge threshold = {{ filestore_merge_threshold }}
   filestore split multiple = {{ filestore_split_multiple }}
   osd op threads = {{ osd_op_threads }}
+  filestore op threads = {{ filestore_op_threads }}
+  filestore max sync interval = {{ filestore_max_sync_interval }}
+  osd max scrubs = {{ osd_max_scrubs }}
   # Recovery tuning
   osd recovery max active = {{ osd_recovery_max_active }}
   osd max backfills = {{ osd_max_backfills }}
   osd recovery op priority = {{ osd_recovery_op_priority }}
+  osd objectstore = {{ osd_objectstore }}
 {% if mds %}
 [mds]
 {% for host in groups['mdss'] %}