diff --git a/group_vars/all.sample b/group_vars/all.sample
index bae2f7b5e..aa87b7257 100644
--- 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 d1dd9c2a6..181c8f993 100644
--- 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
 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/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2
index e5ed65ce6..d3c73e093 100644
--- 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 }}