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>

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 6e65f0d853df4c2183f1eba52b466b995e234c1c..90a4c9480ec56ea561713f15c7538917b0be4239 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -559,6 +559,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'] }}"
@@ -567,6 +568,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'] }}"
@@ -575,6 +577,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'] }}"
@@ -583,6 +586,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'] }}"
@@ -591,6 +595,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 1d51fb4bd2045778e3ae9011f0c05797bbd53e40..b50e26d1b5b5cfaf35458b7a8d0d71f41d703c5c 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -559,6 +559,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'] }}"
@@ -567,6 +568,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'] }}"
@@ -575,6 +577,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'] }}"
@@ -583,6 +586,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'] }}"
@@ -591,6 +595,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 906c5d4dbeb42d6c740c7d0d68371bf8ed95efb9..5c3e8dd157909758bf2d30bc98ddd66fdbd43400 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -551,6 +551,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'] }}"
@@ -559,6 +560,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'] }}"
@@ -567,6 +569,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'] }}"
@@ -575,6 +578,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'] }}"
@@ -583,6 +587,7 @@ openstack_gnocchi_pool:
   type: 1
   erasure_profile: ""
   expected_num_objects: ""
+  application: "rbd"
 
 openstack_pools:
   - "{{ openstack_glance_pool }}"