From ceded7e2c166aabc477ff778af6a025f651ef2f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Fri, 29 Jun 2018 11:46:56 +0200 Subject: [PATCH] ceph-defaults: add default application to pool MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit 103c279c218ae654ec9ced29c1aef54eb8b59990) --- group_vars/all.yml.sample | 5 +++++ group_vars/rhcs.yml.sample | 5 +++++ roles/ceph-defaults/defaults/main.yml | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 03f17bd6f..f486c34b9 100644 --- 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 dac15612f..75fa7ff22 100644 --- 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 02865f21e..4403fd05c 100644 --- 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 }}"