mds: don't enable application pool on cephfs pools

this commit removes the task which enable application on cephfs pools.

See: https://tracker.ceph.com/issues/43761

Fixes: #5278
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 86dc6f8206f11d18baeef100837cc72c23baa3f4)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 575b844245bb731df1eeb311ee1cb66f5dbbbc72..4e654f5448abbe7a178df4af26bc62b9caf5c36d 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -338,7 +338,6 @@ dummy:
 #    type: 1
 #    erasure_profile: ""
 #    expected_num_objects: ""
-#    application: "cephfs"
 #    size: "{{ osd_pool_default_size }}"
 #    min_size: "{{ osd_pool_default_min_size }}"
 #    pg_autoscale_mode: False
@@ -352,7 +351,6 @@ dummy:
 #  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
-#  application: "cephfs"
 #  size: "{{ osd_pool_default_size }}"
 #  min_size: "{{ osd_pool_default_min_size }}"
 #  pg_autoscale_mode: False
@@ -364,7 +362,6 @@ dummy:
 #  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
-#  application: "cephfs"
 #  size: "{{ osd_pool_default_size }}"
 #  min_size: "{{ osd_pool_default_min_size }}"
 #  pg_autoscale_mode: False

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index a62b885365e170593cbec4b15f6883bdb7b1c814..29190b7999fbcc7ff23dff9d27c200aa8475bb99 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -338,7 +338,6 @@ ceph_iscsi_config_dev: false
 #    type: 1
 #    erasure_profile: ""
 #    expected_num_objects: ""
-#    application: "cephfs"
 #    size: "{{ osd_pool_default_size }}"
 #    min_size: "{{ osd_pool_default_min_size }}"
 #    pg_autoscale_mode: False
@@ -352,7 +351,6 @@ ceph_iscsi_config_dev: false
 #  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
-#  application: "cephfs"
 #  size: "{{ osd_pool_default_size }}"
 #  min_size: "{{ osd_pool_default_min_size }}"
 #  pg_autoscale_mode: False
@@ -364,7 +362,6 @@ ceph_iscsi_config_dev: false
 #  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
-#  application: "cephfs"
 #  size: "{{ osd_pool_default_size }}"
 #  min_size: "{{ osd_pool_default_min_size }}"
 #  pg_autoscale_mode: False

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index ba244f19b1b38cc519664145e6054ad9ddd6ed29..fa85ed0d0027138415040ca7399b575a256dc444 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -330,7 +330,6 @@ mon_host_v2:
 #    type: 1
 #    erasure_profile: ""
 #    expected_num_objects: ""
-#    application: "cephfs"
 #    size: "{{ osd_pool_default_size }}"
 #    min_size: "{{ osd_pool_default_min_size }}"
 #    pg_autoscale_mode: False
@@ -344,7 +343,6 @@ cephfs_data_pool:
   type: 1
   erasure_profile: ""
   expected_num_objects: ""
-  application: "cephfs"
   size: "{{ osd_pool_default_size }}"
   min_size: "{{ osd_pool_default_min_size }}"
   pg_autoscale_mode: False
@@ -356,7 +354,6 @@ cephfs_metadata_pool:
   type: 1
   erasure_profile: ""
   expected_num_objects: ""
-  application: "cephfs"
   size: "{{ osd_pool_default_size }}"
   min_size: "{{ osd_pool_default_min_size }}"
   pg_autoscale_mode: False

diff --git a/roles/ceph-mds/tasks/create_mds_filesystems.yml b/roles/ceph-mds/tasks/create_mds_filesystems.yml
index 8c28a541baec5d334234668988a23d18501a8f80..cf670fc68e227a2c3833bd4f9cc48ffe6c984f21 100644 (file)
--- a/roles/ceph-mds/tasks/create_mds_filesystems.yml
+++ b/roles/ceph-mds/tasks/create_mds_filesystems.yml
@@ -70,12 +70,6 @@
             - item.type | default(1) | int != 3
             - item.type | default('replicated') != 'erasure'
 
-        - name: assign application to cephfs pools
-          command: "{{ ceph_run_cmd }} --cluster {{ cluster }} osd pool application enable {{ item.name }} {{ item.application }}"
-          with_items:
-            - "{{ cephfs_data_pool }}"
-            - "{{ cephfs_metadata_pool }}"
-          changed_when: false
 
 - name: check and create ceph filesystem
   delegate_to: "{{ groups[mon_group_name][0] }}"