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 14400b3f02ee6e7db90dac6606a71719d295c99b..8db176a5122ec2c915b29e5bea4970d5d2fb9ad7 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -342,7 +342,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
@@ -356,7 +355,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
@@ -368,7 +366,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 90a79642cb79ad84547f33d2aa349e8d2bd1957f..a1faa76282807eb3fb18c94a6f1f0c87e1bbc01f 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -342,7 +342,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
@@ -356,7 +355,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
@@ -368,7 +366,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 744c678ae24f6a606a4a4b9e1a6f69f0aa0a3e65..00c4cc4fa13c8669faada6f8b8584d8b06433bc2 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -334,7 +334,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
@@ -348,7 +347,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
@@ -360,7 +358,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 c2f5121b8462b5ce5c45a5806ec09b37ce70d103..9dfde4b69eba03ae6288e48992aed85f5b964232 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] }}"