From b3ac0493f1c15b621c820af0849f2b68c1299ab7 Mon Sep 17 00:00:00 2001 From: mathieu bultel Date: Mon, 21 Sep 2020 08:55:13 +0000 Subject: [PATCH] Revert "Revert "Change path for validation Ansible files"" Depends-On: https://review.opendev.org/753709 This reverts commit cbb3375a47031c34e3a12073d8d1c2455d7ecbb0. Change-Id: I83ed0d633ffa04c1133dbeb77b32eafe854f6252 --- scripts/tripleo-validation.py | 4 ++-- setup.cfg | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/tripleo-validation.py b/scripts/tripleo-validation.py index b52d68fd4..68cfead76 100755 --- a/scripts/tripleo-validation.py +++ b/scripts/tripleo-validation.py @@ -17,7 +17,7 @@ import logging from validations_common.validation import Validation -TRIPLEO_VALIDATION_DIR = "/usr/share/openstack-tripleo-validations" +TRIPLEO_VALIDATION_DIR = "/usr/share/ansible/" class TripleOValidation(Validation): @@ -34,7 +34,7 @@ class TripleOValidation(Validation): for action in tripleo_parser._actions: if action.dest == 'validation_dir': if action.default == parser.validation_dir: - parser.validation_dir = "{}/playbooks".format( + parser.validation_dir = "{}/validation-playbooks".format( TRIPLEO_VALIDATION_DIR) if action.dest == 'ansible_base_dir': if action.default == parser.ansible_base_dir: diff --git a/setup.cfg b/setup.cfg index b37e75bc4..1549e1228 100644 --- a/setup.cfg +++ b/setup.cfg @@ -31,10 +31,10 @@ scripts = scripts/tripleo-validation.py data_files = - share/openstack-tripleo-validations/ = hosts.sample - share/openstack-tripleo-validations/ = groups.yaml - share/openstack-tripleo-validations/roles = roles/* - share/openstack-tripleo-validations/playbooks = playbooks/* - share/openstack-tripleo-validations/callback_plugins = callback_plugins/* - share/openstack-tripleo-validations/lookup_plugins = lookup_plugins/* - share/openstack-tripleo-validations/library = library/* + share/ansible = hosts.sample + share/ansible = groups.yaml + share/ansible/roles = roles/* + share/ansible/validation-playbooks = playbooks/* + share/ansible/callback_plugins = callback_plugins/* + share/ansible/lookup_plugins = lookup_plugins/* + share/ansible/library = library/*