From 6e377622be6066476b5186c04ee5ae420c674d21 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Thu, 22 Mar 2018 15:11:27 +0800
Subject: [PATCH] Configure application for ceph pool

pool application is mandatory since ceph Luminous.

Change-Id: I8c124899b46b1388ab3c2957b4ece0f6aab1378b
Closes-Bug: #1757957
---
 ansible/roles/ceph/tasks/start_mdss.yml | 1 +
 ansible/roles/ceph_pools.yml            | 6 ++++++
 ansible/roles/cinder/tasks/ceph.yml     | 2 ++
 ansible/roles/glance/tasks/ceph.yml     | 1 +
 ansible/roles/gnocchi/tasks/ceph.yml    | 1 +
 ansible/roles/nova/tasks/ceph.yml       | 1 +
 6 files changed, 12 insertions(+)

diff --git a/ansible/roles/ceph/tasks/start_mdss.yml b/ansible/roles/ceph/tasks/start_mdss.yml
index 3ec8d69549..4727e0d8c6 100644
--- a/ansible/roles/ceph/tasks/start_mdss.yml
+++ b/ansible/roles/ceph/tasks/start_mdss.yml
@@ -6,6 +6,7 @@
     cache_mode: "{{ item.cache_mode }}"
     pool_pg_num: "{{ item.pool_pg_num }}"
     pool_pgp_num: "{{ item.pool_pgp_num }}"
+    pool_application: "cephfs"
   with_items:
     - pool_name: "{{ cephfs_data_pool_name }}"
       pool_type: "{{ cephfs_data_pool_type }}"
diff --git a/ansible/roles/ceph_pools.yml b/ansible/roles/ceph_pools.yml
index 12a8d02af1..67f7e0d2d3 100644
--- a/ansible/roles/ceph_pools.yml
+++ b/ansible/roles/ceph_pools.yml
@@ -31,6 +31,12 @@
   failed_when: False
   run_once: True
 
+- name: enable application for ceph pool
+  command: docker exec ceph_mon ceph osd pool application enable {{ pool_name }} {{ pool_application }}
+  changed_when: False
+  delegate_to: "{{ groups['ceph-mon'][0] }}"
+  run_once: True
+
 - name: Creating ceph ruleset for cache
   command: docker exec ceph_mon ceph osd crush rule create-simple cache {{ ceph_cache_rule }}
   delegate_to: "{{ groups['ceph-mon'][0] }}"
diff --git a/ansible/roles/cinder/tasks/ceph.yml b/ansible/roles/cinder/tasks/ceph.yml
index 2be771b6aa..01b9bf7292 100644
--- a/ansible/roles/cinder/tasks/ceph.yml
+++ b/ansible/roles/cinder/tasks/ceph.yml
@@ -37,6 +37,7 @@
     cache_mode: "{{ cinder_cache_mode }}"
     pool_pg_num: "{{ cinder_pool_pg_num }}"
     pool_pgp_num: "{{ cinder_pool_pgp_num }}"
+    pool_application: "rbd"
 
 - include: ../../ceph_pools.yml
   vars:
@@ -45,6 +46,7 @@
     cache_mode: "{{ cinder_backup_cache_mode }}"
     pool_pg_num: "{{ cinder_backup_pool_pg_num }}"
     pool_pgp_num: "{{ cinder_backup_pool_pgp_num }}"
+    pool_application: "rbd"
 
 # TODO(SamYaple): Improve changed_when tests
 - name: Pulling cephx keyring for cinder
diff --git a/ansible/roles/glance/tasks/ceph.yml b/ansible/roles/glance/tasks/ceph.yml
index 2c9c8287f3..b8c246e265 100644
--- a/ansible/roles/glance/tasks/ceph.yml
+++ b/ansible/roles/glance/tasks/ceph.yml
@@ -23,6 +23,7 @@
     cache_mode: "{{ glance_cache_mode }}"
     pool_pg_num: "{{ glance_pool_pg_num }}"
     pool_pgp_num: "{{ glance_pool_pgp_num }}"
+    pool_application: "rbd"
 
 # TODO(SamYaple): Improve changed_when tests
 - name: Pulling cephx keyring
diff --git a/ansible/roles/gnocchi/tasks/ceph.yml b/ansible/roles/gnocchi/tasks/ceph.yml
index babaaf4edc..60fa152cf3 100644
--- a/ansible/roles/gnocchi/tasks/ceph.yml
+++ b/ansible/roles/gnocchi/tasks/ceph.yml
@@ -29,6 +29,7 @@
     cache_mode: "{{ gnocchi_cache_mode }}"
     pool_pg_num: "{{ gnocchi_pool_pg_num }}"
     pool_pgp_num: "{{ gnocchi_pool_pgp_num }}"
+    pool_application: "rgw"
 
 # TODO(SamYaple): Improve changed_when tests
 - name: Pulling cephx keyring
diff --git a/ansible/roles/nova/tasks/ceph.yml b/ansible/roles/nova/tasks/ceph.yml
index fd2ecdc7ee..1500f5fbde 100644
--- a/ansible/roles/nova/tasks/ceph.yml
+++ b/ansible/roles/nova/tasks/ceph.yml
@@ -31,6 +31,7 @@
     cache_mode: "{{ nova_cache_mode }}"
     pool_pg_num: "{{ nova_pool_pg_num }}"
     pool_pgp_num: "{{ nova_pool_pgp_num }}"
+    pool_application: "rbd"
 
 # TODO(SamYaple): Improve changed_when tests
 - name: Pulling cephx keyring for nova