From e491cbdbaa839d5ea004889e96248dc130aadc96 Mon Sep 17 00:00:00 2001
From: John Fulton <fulton@redhat.com>
Date: Tue, 22 May 2018 20:17:44 +0000
Subject: [PATCH] Set default application for Ceph Luminous openstack_pools

Luminous can assign application types to pools and ceph-ansible
supports this, provided it is passed an appropriate list of maps.
The list of maps is defined in openstack_pools and this change
updates this variable to contain the correct default application
type.

Includes update to environments/disable-telemetry.yaml so that
the GnocchiRbdPool is not created if telemetry is disabled.

Change-Id: I3966a8a1b170202e020684a36ecece78599296b5
Closes-Bug: #1772743
(cherry picked from commit 959cb6c5391bae657113ec6f69abe1a7cc277ee5)
---
 docker/services/ceph-ansible/ceph-base.yaml | 9 ++++++++-
 environments/disable-telemetry.yaml         | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml
index e0fa64cc23..5c3a11e840 100644
--- a/docker/services/ceph-ansible/ceph-base.yaml
+++ b/docker/services/ceph-ansible/ceph-base.yaml
@@ -246,6 +246,7 @@ outputs:
                         name: <%pool%>
                         pg_num: {get_param: CephPoolDefaultPgNum}
                         rule_name: ""
+                        application: rbd
                       for_each:
                         <%pool%>:
                           list_concat_unique:
@@ -253,9 +254,15 @@ outputs:
                               - {get_param: CinderBackupRbdPoolName}
                               - {get_param: NovaRbdPoolName}
                               - {get_param: GlanceRbdPoolName}
-                              - {get_param: GnocchiRbdPoolName}
                             # CinderRbdExtraPools is a list (do not indent further)
                             - {get_param: CinderRbdExtraPools}
+                  - if:
+                    - equals: [{get_param: GnocchiRbdPoolName}, '']
+                    - []
+                    - - name: {get_param: GnocchiRbdPoolName}
+                        pg_num: {get_param: CephPoolDefaultPgNum}
+                        rule_name: ""
+                        application: openstack_gnocchi
                   - {get_param: CephPools}
           openstack_keys: &openstack_keys
           - name:
diff --git a/environments/disable-telemetry.yaml b/environments/disable-telemetry.yaml
index 1aa10c23f3..7f07b95330 100644
--- a/environments/disable-telemetry.yaml
+++ b/environments/disable-telemetry.yaml
@@ -18,3 +18,4 @@ resource_registry:
 
 parameter_defaults:
   NotificationDriver: 'noop'
+  GnocchiRbdPoolName: ''