Merge "Set Ceph pools rule_name to replicated_rule"

This commit is contained in:
Zuul 2018-06-15 12:03:25 +00:00 committed by Gerrit Code Review
commit b7dcbd8da7
2 changed files with 4 additions and 4 deletions

View File

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

View File

@ -83,7 +83,7 @@ parameters:
description: >
It can be used to override settings for one of the predefined pools, or to create
additional ones. Example:
[{"name": "volumes", "pg_num": 64, "rule_name": ""}]
[{"name": "volumes", "pg_num": 64, "rule_name": "replicated_rule"}]
default: []
type: json
CinderRbdPoolName:
@ -226,7 +226,7 @@ resources:
template:
name: <%pool%>
pg_num: {get_param: CephPoolDefaultPgNum}
rule_name: ""
rule_name: replicated_rule
application: rbd
for_each:
<%pool%>:
@ -242,7 +242,7 @@ resources:
- []
- - name: {get_param: GnocchiRbdPoolName}
pg_num: {get_param: CephPoolDefaultPgNum}
rule_name: ""
rule_name: replicated_rule
application: openstack_gnocchi
- {get_param: CephPools}
openstack_keys: &openstack_keys