Revert "Revert "Update install path for roles and plugins""

This reverts commit I2f24738cf7ec13230e1111f4cc209e4843b416a4.

Depends-On: I1bf74a4fb0adcae632c06b38e06a572ebc434201
Change-Id: I2822aaf51163d38282f9b5f07ee93a4d9c01c9ba
Signed-off-by: Kevin Carter <kecarter@redhat.com>

setup.cfg

@@ -22,9 +22,9 @@ setup-hooks =
 [files]
 data_files =
     share/ansible/tripleo-playbooks/ = tripleo_ansible/playbooks/*
-    share/ansible/tripleo-plugins/ = tripleo_ansible/ansible_plugins/*
+    share/ansible/plugins/ = tripleo_ansible/ansible_plugins/*
-    share/ansible/tripleo-roles/ = tripleo_ansible/roles/*
+    share/ansible/roles/ = tripleo_ansible/roles/*
-    share/ansible/tripleo-roles/tripleo-docker-rm/ = tripleo_ansible/roles/tripleo-docker-rm/*
+    share/ansible/roles/tripleo-docker-rm/ = tripleo_ansible/roles/tripleo-docker-rm/*
 
 [wheel]
 universal = 1

zuul.d/layout.yaml

@@ -24,6 +24,7 @@
           files:
           - ^tripleo_ansible/roles/tripleo-hieradata/.*
           - ^tripleo_ansible/roles/tripleo-upgrade-hiera/.*
+          - ^setup.*
           irrelevant-files: *irrelevant_scenario_files
       - tripleo-ci-centos-7-scenario002-standalone: &scenario002
           files:

zuul.d/playbooks/pre.yml

@@ -12,7 +12,6 @@
           - "{{ tripleo_ansible_project_path }}/tripleo_ansible/roles.galaxy/config_template/action"
           - "{{ tripleo_ansible_project_path }}/tripleo_ansible/ansible_plugins/action"
           - "/usr/share/ansible/plugins/action"
-          - "/usr/share/ansible/tripleo-plugins/action"
 
     - name: Ensure output dirs
       file:

zuul.d/playbooks/run.yml

@@ -14,7 +14,6 @@
           - "{{ tripleo_ansible_project_path }}/tripleo_ansible/roles.galaxy/config_template/action"
           - "{{ tripleo_ansible_project_path }}/tripleo_ansible/ansible_plugins/action"
           - "/usr/share/ansible/plugins/action"
-          - "/usr/share/ansible/tripleo-plugins/action"
   tasks:
     - name: Run role test job
       shell: |-