aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2017-10-02 14:10:53 +0200
committerGiulio Fidente <gfidente@redhat.com>2017-10-30 09:59:42 +0100
commitf0bd09dc2807d1d1edcfd9a3d87c6ba8c70e2267 (patch)
tree5a7b4f2d33a26daa628b24ec1ce54f0518450ecd /tools
parent9dfec11795703b43991e06ef880b52cd0b3a5eb4 (diff)
Update CephPools format in the docker templates to fit ceph-ansible
The format which ceph-ansible uses to describe the list of pools to be created in the cluster is different from the one which puppet-ceph uses; this commit updates the description and the the docker templates accordingly. Change-Id: I1e5b2c3cbf6ae02c19a2275ca119fed6e173319d Closes-Bug: #1720373 (cherry picked from commit c10aa7a0439fb7d8e8e964e75d73f3cbb54aa9ec)
Diffstat (limited to 'tools')
-rwxr-xr-xtools/yaml-validate.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index c322962..76f856d 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -46,7 +46,10 @@ OPTIONAL_DOCKER_PUPPET_CONFIG_SECTIONS = [ 'puppet_tags', 'volumes' ]
# consistency across files on. This should only contain parameters whose
# definition we cannot change for backwards compatibility reasons. New
# parameters to the templates should not be added to this list.
-PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
+PARAMETER_DEFINITION_EXCLUSIONS = {'CephPools': ['description',
+ 'type',
+ 'default'],
+ 'ManagementNetCidr': ['default'],
'ManagementAllocationPools': ['default'],
'ExternalNetCidr': ['default'],
'ExternalAllocationPools': ['default'],