Merge "Update tripleo-validations path to /usr/share/ansible"

tripleoclient/constants.py

@@ -93,7 +93,10 @@ ENABLE_SSH_ADMIN_SSH_PORT_TIMEOUT = 600
 
 ADDITIONAL_ARCHITECTURES = ['ppc64le']
 
-DEFAULT_VALIDATIONS_BASEDIR = '/usr/share/openstack-tripleo-validations'
+DEFAULT_VALIDATIONS_BASEDIR = (
+    "/usr/share/ansible"
+    if os.path.exists("/usr/share/ansible/validation-playbooks")
+    else "/usr/share/openstack-tripleo-validations")
 
 VALIDATIONS_LOG_BASEDIR = '/var/log/validations'
 
@@ -103,8 +106,11 @@ DEFAULT_WORK_DIR = os.path.join(os.environ.get('HOME', '~/'),
 ANSIBLE_INVENTORY = os.path.join(DEFAULT_WORK_DIR,
                                  '{}/tripleo-ansible-inventory.yaml')
 
-ANSIBLE_VALIDATION_DIR = \
-    '/usr/share/openstack-tripleo-validations/playbooks'
+ANSIBLE_VALIDATION_DIR = (
+    "/usr/share/ansible/validation-playbooks"
+    if os.path.exists("/usr/share/ansible/validation-playbooks")
+    else "/usr/share/openstack-tripleo-validations/playbooks")
+
 ANSIBLE_TRIPLEO_PLAYBOOKS = \
     '/usr/share/ansible/tripleo-playbooks'
 

tripleoclient/tests/v1/tripleo/test_tripleo_validator.py

@@ -50,7 +50,7 @@ VALIDATIONS_LOGS_CONTENTS_LIST = [{
             'id': '008886df-d297-1eaa-2a74-000000000008',
             'validation_id': '512e',
             'validation_path':
-            '/usr/share/openstack-tripleo-validations/playbooks'
+            '/usr/share/ansible/validation-playbooks'
         },
         'tasks': [
             {