aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorSteven Hardy <shardy@redhat.com>2017-06-08 19:07:51 +0100
committerSteven Hardy <shardy@redhat.com>2017-06-09 17:10:43 +0100
commit316cc2572d0a255d466fb7f9aa74de3b8ccb6831 (patch)
treecfcfed57b679024ed5be2d94a6bfa73bd2e26807 /tools
parentcf17396a371d4e48ff9a961c813a1327b4631ee8 (diff)
Remove duplicate docker/puppet services.yaml
Move to one common services.yaml not only reduces the duplication, but it should improve performance for the docker/services.yaml case, because we were creating two ResourceChains with $many services which we know can be really slow (especially since we seem to be missing concurrent: true on one) Change-Id: I76f188438bfc6449b152c2861d99738e6eb3c61b
Diffstat (limited to 'tools')
-rwxr-xr-xtools/yaml-validate.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index 92d76d2..0fd4bcc 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -219,12 +219,10 @@ def validate(filename):
# qdr aliases rabbitmq service to provide alternative messaging backend
if (filename.startswith('./puppet/services/') and
- filename not in ['./puppet/services/services.yaml',
- './puppet/services/qdr.yaml']):
+ filename not in ['./puppet/services/qdr.yaml']):
retval = validate_service(filename, tpl)
- if (filename.startswith('./docker/services/') and
- filename != './docker/services/services.yaml'):
+ if filename.startswith('./docker/services/'):
retval = validate_docker_service(filename, tpl)
if filename.endswith('hyperconverged-ceph.yaml'):