From bf61a6fc11765f2596faa3c9a26982f0caa6032e Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Mon, 26 Aug 2019 07:57:52 -0500 Subject: [PATCH] Update install path for roles and plugins This change updates the install path for roles and plugins making it so these resources are always available whenever `ansible` commands are invoked. Change-Id: I00f6a71424882115fa0c765142c03797d9daa285 Signed-off-by: Kevin Carter --- setup.cfg | 6 +++--- zuul.d/playbooks/pre.yml | 1 - zuul.d/playbooks/run.yml | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/setup.cfg b/setup.cfg index 64461049c..1372a0ccc 100644 --- a/setup.cfg +++ b/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/tripleo-roles/ = tripleo_ansible/roles/* - share/ansible/tripleo-roles/tripleo-docker-rm/ = tripleo_ansible/roles/tripleo-docker-rm/* + share/ansible/plugins/ = tripleo_ansible/ansible_plugins/* + share/ansible/roles/ = tripleo_ansible/roles/* + share/ansible/roles/tripleo-docker-rm/ = tripleo_ansible/roles/tripleo-docker-rm/* [wheel] universal = 1 diff --git a/zuul.d/playbooks/pre.yml b/zuul.d/playbooks/pre.yml index 1a92f0fac..594df6a11 100644 --- a/zuul.d/playbooks/pre.yml +++ b/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: diff --git a/zuul.d/playbooks/run.yml b/zuul.d/playbooks/run.yml index 2cf19031f..1ced4073e 100644 --- a/zuul.d/playbooks/run.yml +++ b/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: |-