openstack/tripleo-heat-templates
Code Issues Proposed changes

Move remnants of environments/services-docker

Browse Source 
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>
This commit is contained in:
Bogdan Dobrelya 2018-04-20 09:49:37 +02:00
parent 297aac5c25
commit 4053399860
5 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/services-docker/tripleo-ui.yaml
View File

@ -1,2 +0,0 @@
resource_registry:
OS::TripleO::Services::TripleoUI: ../../docker/services/tripleo-ui.yaml

0
environments/services-docker/novajoin.yaml → environments/services/novajoin.yaml
View File

0
environments/services-docker/tempest.yaml → environments/services/tempest.yaml
View File

0
environments/services-docker/update-odl.yaml → environments/services/update-odl.yaml
View File

9
tools/yaml-validate.py
View File

@ -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)