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

1 files changed, 2 insertions, 4 deletions

diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index 92d76d23..0fd4bcc3 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'):