From: Dmitriy Rabotyagov <noonedeadpunk@ya.ru>
Date: Thu, 16 Jan 2020 17:41:06 +0000 (+0200)
Subject: Fix application for openstack_cephfs pools
X-Git-Tag: v6.0.0alpha1~106
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c81a213a6d00aeeb1d683e762747a3df61e32da8;p=ceph-ansible.git

Fix application for openstack_cephfs pools

RBD is invalid application for cephfs pools, so it was change to cephfs.

Signed-off-by: Dmitriy Rabotyagov <drabotyagov@vexxhost.com>
---

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 418418d30..1c3b5d535 100644
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -662,7 +662,7 @@ dummy:
 #  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
-#  application: "rbd"
+#  application: "cephfs"
 #  size: "{{ osd_pool_default_size }}"
 #  min_size: "{{ osd_pool_default_min_size }}"
 #openstack_cephfs_metadata_pool:
@@ -673,7 +673,7 @@ dummy:
 #  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
-#  application: "rbd"
+#  application: "cephfs"
 #  size: "{{ osd_pool_default_size }}"
 #  min_size: "{{ osd_pool_default_min_size }}"
 
diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 1e95ac048..fce80019d 100644
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -662,7 +662,7 @@ ceph_docker_registry_auth: true
 #  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
-#  application: "rbd"
+#  application: "cephfs"
 #  size: "{{ osd_pool_default_size }}"
 #  min_size: "{{ osd_pool_default_min_size }}"
 #openstack_cephfs_metadata_pool:
@@ -673,7 +673,7 @@ ceph_docker_registry_auth: true
 #  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
-#  application: "rbd"
+#  application: "cephfs"
 #  size: "{{ osd_pool_default_size }}"
 #  min_size: "{{ osd_pool_default_min_size }}"
 
diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 15a62e115..233d65285 100644
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -654,7 +654,7 @@ openstack_cephfs_data_pool:
   type: 1
   erasure_profile: ""
   expected_num_objects: ""
-  application: "rbd"
+  application: "cephfs"
   size: "{{ osd_pool_default_size }}"
   min_size: "{{ osd_pool_default_min_size }}"
 openstack_cephfs_metadata_pool:
@@ -665,7 +665,7 @@ openstack_cephfs_metadata_pool:
   type: 1
   erasure_profile: ""
   expected_num_objects: ""
-  application: "rbd"
+  application: "cephfs"
   size: "{{ osd_pool_default_size }}"
   min_size: "{{ osd_pool_default_min_size }}"