From 405339986060e4c851d846fdb7d5be05f43fd75e Mon Sep 17 00:00:00 2001 From: Bogdan Dobrelya <bdobreli@redhat.com> Date: Fri, 20 Apr 2018 09:49:37 +0200 Subject: [PATCH] Move remnants of environments/services-docker Move new files, which made it into environments/services-docker. Ensure YAML validate will not pass for environments/services-docker any more. Change-Id: If16cf6bdafa8e10480134d356a7d7787f1c0bd72 Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com> --- environments/services-docker/tripleo-ui.yaml | 2 -- environments/{services-docker => services}/novajoin.yaml | 0 environments/{services-docker => services}/tempest.yaml | 0 .../{services-docker => services}/update-odl.yaml | 0 tools/yaml-validate.py | 9 ++++++++- 5 files changed, 8 insertions(+), 3 deletions(-) delete mode 100644 environments/services-docker/tripleo-ui.yaml rename environments/{services-docker => services}/novajoin.yaml (100%) rename environments/{services-docker => services}/tempest.yaml (100%) rename environments/{services-docker => services}/update-odl.yaml (100%) diff --git a/environments/services-docker/tripleo-ui.yaml b/environments/services-docker/tripleo-ui.yaml deleted file mode 100644 index 2b2d0273b9..0000000000 --- a/environments/services-docker/tripleo-ui.yaml +++ /dev/null @@ -1,2 +0,0 @@ -resource_registry: - OS::TripleO::Services::TripleoUI: ../../docker/services/tripleo-ui.yaml diff --git a/environments/services-docker/novajoin.yaml b/environments/services/novajoin.yaml similarity index 100% rename from environments/services-docker/novajoin.yaml rename to environments/services/novajoin.yaml diff --git a/environments/services-docker/tempest.yaml b/environments/services/tempest.yaml similarity index 100% rename from environments/services-docker/tempest.yaml rename to environments/services/tempest.yaml diff --git a/environments/services-docker/update-odl.yaml b/environments/services/update-odl.yaml similarity index 100% rename from environments/services-docker/update-odl.yaml rename to environments/services/update-odl.yaml diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index d18bfd59be..25747bed50 100755 --- a/tools/yaml-validate.py +++ b/tools/yaml-validate.py @@ -1043,8 +1043,15 @@ for base_path in path_args: if '.tox' in dirs: dirs.remove('.tox') for f in files: + file_path = os.path.join(subdir, f) + if 'environments/services-docker' in file_path: + print("ERROR: environments/services-docker should not be used " + "any more, use environments/services instead: %s " % + file_path) + failed_files.append(file_path) + exit_val |= 1 + if f.endswith('.yaml') and not f.endswith('.j2.yaml'): - file_path = os.path.join(subdir, f) failed = validate(file_path, param_map) if failed: failed_files.append(file_path)