From ea550f80ac6969cc89cb6cf8890bd154aeadeff1 Mon Sep 17 00:00:00 2001
From: Mathieu Bultel <mat.bultel@gmail.com>
Date: Mon, 24 Aug 2020 17:54:45 +0200
Subject: [PATCH] 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/749385
Change-Id: I62e36f4ab7a77b5120e014dc61168a1ccc9fc6e0
---
 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 4de9f9e0e..dcf8411c0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -30,10 +30,10 @@ scripts =
     scripts/run-validations.sh
 
 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/*