Add primary affinity option

Signed-off-by: leseb <seb@redhat.com>

diff --git a/group_vars/all.sample b/group_vars/all.sample
index bae2f7b5e85584af34fbf1149ffdbc4f2110cc6e..aa87b725760b74330778ebb97c5f8e6b58ec3c02 100644 (file)
--- a/group_vars/all.sample
+++ b/group_vars/all.sample
@@ -114,6 +114,7 @@ dummy:
 #mon_osd_nearfull_ratio: .85
 #mon_osd_report_timeout: 300
 #mon_pg_warn_max_per_osd: 0 # disable complains about low pgs numbers per osd
+#mon_osd_allow_primary_affinity: "true"
 
 ## OSD options
 #

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index d1dd9c2a679ce597341c4e841c29d4f3f2a7b1f1..181c8f993afc0f68bbcce2bf59b7564a5052e6eb 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -121,6 +121,7 @@ mon_osd_full_ratio: .95
 mon_osd_nearfull_ratio: .85\r
 mon_osd_report_timeout: 300\r
 mon_pg_warn_max_per_osd: 0 # disable complains about low pgs numbers per osd\r
+mon_osd_allow_primary_affinity: "true"\r
 \r
 ## OSD options\r
 #\r

diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2
index e5ed65ce6e3d10448eae468f3c71c7c2b02e6ce4..d3c73e093c5be031f0e8d43dae451f8b7f51f009 100644 (file)
--- a/roles/ceph-common/templates/ceph.conf.j2
+++ b/roles/ceph-common/templates/ceph.conf.j2
@@ -80,6 +80,7 @@
   mon osd nearfull ratio = {{ mon_osd_nearfull_ratio }}
   mon osd report timeout = {{ mon_osd_report_timeout }}
   mon pg warn max per osd = {{ mon_pg_warn_max_per_osd }}
+  mon osd allow primary affinity = {{ mon_osd_allow_primary_affinity }}
 
 {% if enable_debug_mon %}
   debug mon = {{ debug_mon_level }}