Merge "Move roles into a standard directory layout"

2020-08-16 17:53:49 +00:00 · 2020-08-16 17:53:49 +00:00 · a0ad704754
parent 67431c9137 53636ba03c
commit a0ad704754
8 changed files with 4 additions and 3 deletions
--- a/doc/source/user/ansible.rst
+++ b/doc/source/user/ansible.rst
@ -1 +1 @@
-.. include:: ../../../roles/metalsmith_deployment/README.rst
+.. include:: ../../../metalsmith_ansible/roles/metalsmith_deployment/README.rst
--- a/metalsmith_ansible/roles/metalsmith_deployment/README.rst
+++ b/metalsmith_ansible/roles/metalsmith_deployment/README.rst
--- a/metalsmith_ansible/roles/metalsmith_deployment/defaults/main.yml
+++ b/metalsmith_ansible/roles/metalsmith_deployment/defaults/main.yml
--- a/metalsmith_ansible/roles/metalsmith_deployment/meta/main.yml
+++ b/metalsmith_ansible/roles/metalsmith_deployment/meta/main.yml
--- a/metalsmith_ansible/roles/metalsmith_deployment/tasks/main.yml
+++ b/metalsmith_ansible/roles/metalsmith_deployment/tasks/main.yml
--- a/1
+++ b/1
@ -0,0 +1 @@
+metalsmith_ansible/roles
--- a/setup.cfg
+++ b/setup.cfg
@ -26,7 +26,7 @@ packages =
    metalsmith

 data_files =
-    share/ansible/roles/metalsmith_deployment = roles/metalsmith_deployment/*
+    share/ansible/roles/ = metalsmith_ansible/roles/*

 [entry_points]
 console_scripts =
--- a/tox.ini
+++ b/tox.ini
@ -44,7 +44,7 @@ passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY \
 [testenv:pep8]
 commands =
    flake8 metalsmith
-    doc8 README.rst doc/source roles
+    doc8 README.rst doc/source metalsmith_ansible/roles

 [testenv:docs]
 deps =