Merge "Fix ceph role set target_max_bytes for cache pools"

ansible/group_vars/all.yml

@@ -525,6 +525,12 @@ octavia_amp_flavor_id:
 # Ceph can be setup with a caching to improve performance. To use the cache you
 # must provide separate disks than those for the OSDs
 ceph_enable_cache: "no"
+
+# Ceph is not able to determine the size of a cache pool automatically,
+# so the configuration on the absolute size is required here, otherwise the flush/evict will not work.
+ceph_target_max_bytes: ""
+ceph_target_max_objects: ""
+
 # Valid options are [ forward, none, writeback ]
 ceph_cache_mode: "writeback"
 

ansible/roles/ceph_pools.yml

@@ -78,3 +78,23 @@
   failed_when: False
   run_once: True
   when: "{{ ceph_enable_cache | bool }}"
+
+- name: Setting cache target_max_bytes
+  command: docker exec ceph_mon ceph osd pool set {{ pool_name }}-cache target_max_bytes {{ ceph_target_max_bytes }}
+  delegate_to: "{{ groups['ceph-mon'][0] }}"
+  changed_when: False
+  failed_when: False
+  run_once: True
+  when:
+    - "{{ ceph_enable_cache | bool }}"
+    - "{{ ceph_target_max_bytes != '' }}"
+
+- name: Setting cache target_max_objects
+  command: docker exec ceph_mon ceph osd pool set {{ pool_name }}-cache target_max_objects {{ ceph_target_max_objects }}
+  delegate_to: "{{ groups['ceph-mon'][0] }}"
+  changed_when: False
+  failed_when: False
+  run_once: True
+  when:
+    - "{{ ceph_enable_cache | bool }}"
+    - "{{ ceph_target_max_objects != '' }}"

etc/kolla/globals.yml

@@ -201,6 +201,12 @@ kolla_internal_vip_address: "10.10.10.254"
 # Ceph can be setup with a caching to improve performance. To use the cache you
 # must provide separate disks than those for the OSDs
 #ceph_enable_cache: "no"
+
+# Ceph is not able to determine the size of a cache pool automatically,
+# so the configuration on the absolute size is required here, otherwise the flush/evict will not work.
+#ceph_target_max_bytes: ""
+#ceph_target_max_objects: ""
+
 # Valid options are [ forward, none, writeback ]
 #ceph_cache_mode: "writeback"