openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Set Ceph pools rule_name to replicated_rule 

By setting the value of rule_name explicitly, we prevent backward
incompatibility issues because the default which ceph-ansible uses
might fit a particular version of Ceph, not all.

Note that the actual value for rule_name is different in the Pike
backport, deploying Ceph Jewel, because it needs to be set to
"replicated_ruleset" and not "replicated_rule" as with Ceph Luminous.

Change-Id: I275c1ca53ea79eea607cbbb58aa21cae6d6be80b
Closes-Bug: 1776252
(cherry picked from commit dcf558628f)
This commit is contained in:
Giulio Fidente 2018-06-11 18:57:02 +02:00 committed by Alex Schultz
parent 85a7c2bea4
commit 74b5bda397
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/services/ceph-ansible/ceph-base.yaml
View File

@ -77,7 +77,7 @@ parameters:
description: > description: >
It can be used to override settings for one of the predefined pools, or to create It can be used to override settings for one of the predefined pools, or to create
additional ones. Example: additional ones. Example:
[{"name": "volumes", "pg_num": 64, "rule_name": ""}] [{"name": "volumes", "pg_num": 64, "rule_name": "replicated_ruleset"}]
default: [] default: []
type: json type: json
CinderRbdPoolName: CinderRbdPoolName:
@ -229,7 +229,7 @@ outputs:
template: template:
name: <%pool%> name: <%pool%>
pg_num: {get_param: CephPoolDefaultPgNum} pg_num: {get_param: CephPoolDefaultPgNum}
rule_name: "" rule_name: replicated_ruleset
for_each: for_each:
<%pool%>: <%pool%>:
- {get_param: CinderRbdPoolName} - {get_param: CinderRbdPoolName}