diff --git a/roles/validations/defaults/main.yaml b/roles/validations/defaults/main.yaml index becc2e7..f5ec802 100644 --- a/roles/validations/defaults/main.yaml +++ b/roles/validations/defaults/main.yaml @@ -1,8 +1,8 @@ --- log_dir: "{{ ansible_user_dir }}/logs" zuul_work_virtualenv: "{{ ansible_user_dir }}/.venv" -ansible_dir: "{{ zuul_work_virtualenv }}/share/validations-common" -validation_dir: "{{ zuul_work_virtualenv }}/share/validations-common/playbooks" +ansible_dir: "{{ zuul_work_virtualenv }}/share/ansible/" +validation_dir: "{{ zuul_work_virtualenv }}/share/ansible/validation-playbooks" vf_log_dir: "/var/log/validations" val_exec: "source {{ zuul_work_virtualenv }}/bin/activate; validation.py" command: diff --git a/setup.cfg b/setup.cfg index f4582a6..50b4ea6 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,11 +29,11 @@ scripts = validations_common/validation.py data_files = - share/validations-common/roles = validations_common/roles/* - share/validations-common/callback_plugins = validations_common/callback_plugins/* - share/validations-common/lookup_plugins = validations_common/lookup_plugins/* - share/validations-common/library = validations_common/library/* - share/validations-common/playbooks = validations_common/playbooks/* + share/ansible/roles = validations_common/roles/* + share/ansible/callback_plugins = validations_common/callback_plugins/* + share/ansible/lookup_plugins = validations_common/lookup_plugins/* + share/ansible/library = validations_common/library/* + share/ansible/validation-playbooks = validations_common/playbooks/* [compile_catalog] directory = validations-common/locale