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.

Change-Id: I275c1ca53ea79eea607cbbb58aa21cae6d6be80b
Closes-Bug: 1776252
This commit is contained in:
Giulio Fidente 2018-06-11 18:57:02 +02:00
parent a2c8a130db
commit dcf558628f
2 changed files with 4 additions and 4 deletions

View File

@ -124,7 +124,7 @@ parameter_defaults:
CephPools: CephPools:
- name: altrbd - name: altrbd
pg_num: 8 pg_num: 8
rule_name: '' rule_name: replicated_rule
CephAnsibleExtraConfig: CephAnsibleExtraConfig:
centos_package_dependencies: [] centos_package_dependencies: []
ceph_osd_docker_memory_limit: '1g' ceph_osd_docker_memory_limit: '1g'

View File

@ -83,7 +83,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_rule"}]
default: [] default: []
type: json type: json
CinderRbdPoolName: CinderRbdPoolName:
@ -226,7 +226,7 @@ resources:
template: template:
name: <%pool%> name: <%pool%>
pg_num: {get_param: CephPoolDefaultPgNum} pg_num: {get_param: CephPoolDefaultPgNum}
rule_name: "" rule_name: replicated_rule
application: rbd application: rbd
for_each: for_each:
<%pool%>: <%pool%>:
@ -242,7 +242,7 @@ resources:
- [] - []
- - name: {get_param: GnocchiRbdPoolName} - - name: {get_param: GnocchiRbdPoolName}
pg_num: {get_param: CephPoolDefaultPgNum} pg_num: {get_param: CephPoolDefaultPgNum}
rule_name: "" rule_name: replicated_rule
application: openstack_gnocchi application: openstack_gnocchi
- {get_param: CephPools} - {get_param: CephPools}
openstack_keys: &openstack_keys openstack_keys: &openstack_keys