commit d07801799712936e93e961ba0e59fa00d2ffc89a Author: Mathieu Bultel Date: Mon Aug 24 17:54:45 2020 +0200 Change path for validation Ansible files Move Ansible files from share/openstack/tripleo-validation to share/ansible like tripleo-ansible project Depends-On: https://review.opendev.org/750369/ Change-Id: I62e36f4ab7a77b5120e014dc61168a1ccc9fc6e0 (cherry picked from commit ea550f80ac6969cc89cb6cf8890bd154aeadeff1) diff --git a/scripts/tripleo-validation.py b/scripts/tripleo-validation.py index b52d68f..68cfead 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 088ee63..1d2badc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -30,10 +30,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/*