ceph-defaults: add default application to pool

We now add a default 'rbd' application type to each pool we create. This
will remove the warning: "  application not enabled on N pool(s) "

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1590275
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 103c279c218ae654ec9ced29c1aef54eb8b59990)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 03f17bd6fa0174037453daaceb76b49dfea5a070..f486c34b9c0d316b257ff653d17ced3c229d6d7e 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -552,6 +552,7 @@ dummy:
 #  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
+#  application: "rbd"
 #openstack_cinder_pool:
 #  name: "volumes"
 #  pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
@@ -560,6 +561,7 @@ dummy:
 #  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
+#  application: "rbd"
 #openstack_nova_pool:
 #  name: "vms"
 #  pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
@@ -568,6 +570,7 @@ dummy:
 #  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
+#  application: "rbd"
 #openstack_cinder_backup_pool:
 #  name: "backups"
 #  pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
@@ -576,6 +579,7 @@ dummy:
 #  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
+#  application: "rbd"
 #openstack_gnocchi_pool:
 #  name: "metrics"
 #  pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
@@ -584,6 +588,7 @@ dummy:
 #  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
+#  application: "rbd"
 
 #openstack_pools:
 #  - "{{ openstack_glance_pool }}"

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index dac15612f9b92416c55aec14a3bdb02bc91a61b6..75fa7ff2292ffd332ea208144dc2b1a56be5e4d7 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -552,6 +552,7 @@ ceph_repository: rhcs
 #  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
+#  application: "rbd"
 #openstack_cinder_pool:
 #  name: "volumes"
 #  pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
@@ -560,6 +561,7 @@ ceph_repository: rhcs
 #  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
+#  application: "rbd"
 #openstack_nova_pool:
 #  name: "vms"
 #  pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
@@ -568,6 +570,7 @@ ceph_repository: rhcs
 #  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
+#  application: "rbd"
 #openstack_cinder_backup_pool:
 #  name: "backups"
 #  pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
@@ -576,6 +579,7 @@ ceph_repository: rhcs
 #  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
+#  application: "rbd"
 #openstack_gnocchi_pool:
 #  name: "metrics"
 #  pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
@@ -584,6 +588,7 @@ ceph_repository: rhcs
 #  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
+#  application: "rbd"
 
 #openstack_pools:
 #  - "{{ openstack_glance_pool }}"

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index 02865f21e08eba1fada4c2f6149ed90db1a82ca3..4403fd05cfd0825c237a078a4c681952fcc13387 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -545,6 +545,7 @@ openstack_glance_pool:
   type: 1
   erasure_profile: ""
   expected_num_objects: ""
+  application: "rbd"
 openstack_cinder_pool:
   name: "volumes"
   pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
@@ -553,6 +554,7 @@ openstack_cinder_pool:
   type: 1
   erasure_profile: ""
   expected_num_objects: ""
+  application: "rbd"
 openstack_nova_pool:
   name: "vms"
   pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
@@ -561,6 +563,7 @@ openstack_nova_pool:
   type: 1
   erasure_profile: ""
   expected_num_objects: ""
+  application: "rbd"
 openstack_cinder_backup_pool:
   name: "backups"
   pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
@@ -569,6 +572,7 @@ openstack_cinder_backup_pool:
   type: 1
   erasure_profile: ""
   expected_num_objects: ""
+  application: "rbd"
 openstack_gnocchi_pool:
   name: "metrics"
   pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
@@ -577,6 +581,7 @@ openstack_gnocchi_pool:
   type: 1
   erasure_profile: ""
   expected_num_objects: ""
+  application: "rbd"
 
 openstack_pools:
   - "{{ openstack_glance_pool }}"