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 959cb6c539
)
This commit is contained in:
parent
700cd7c4b0
commit
e491cbdbaa
|
@ -246,6 +246,7 @@ outputs:
|
||||||
name: <%pool%>
|
name: <%pool%>
|
||||||
pg_num: {get_param: CephPoolDefaultPgNum}
|
pg_num: {get_param: CephPoolDefaultPgNum}
|
||||||
rule_name: ""
|
rule_name: ""
|
||||||
|
application: rbd
|
||||||
for_each:
|
for_each:
|
||||||
<%pool%>:
|
<%pool%>:
|
||||||
list_concat_unique:
|
list_concat_unique:
|
||||||
|
@ -253,9 +254,15 @@ outputs:
|
||||||
- {get_param: CinderBackupRbdPoolName}
|
- {get_param: CinderBackupRbdPoolName}
|
||||||
- {get_param: NovaRbdPoolName}
|
- {get_param: NovaRbdPoolName}
|
||||||
- {get_param: GlanceRbdPoolName}
|
- {get_param: GlanceRbdPoolName}
|
||||||
- {get_param: GnocchiRbdPoolName}
|
|
||||||
# CinderRbdExtraPools is a list (do not indent further)
|
# CinderRbdExtraPools is a list (do not indent further)
|
||||||
- {get_param: CinderRbdExtraPools}
|
- {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}
|
- {get_param: CephPools}
|
||||||
openstack_keys: &openstack_keys
|
openstack_keys: &openstack_keys
|
||||||
- name:
|
- name:
|
||||||
|
|
|
@ -18,3 +18,4 @@ resource_registry:
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
NotificationDriver: 'noop'
|
NotificationDriver: 'noop'
|
||||||
|
GnocchiRbdPoolName: ''
|
||||||
|
|
Loading…
Reference in New Issue