Merge "Change path for validation Ansible files"

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:

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/*