Standardize auxiliary file location across os-charms

Change-Id: Ifaa5453bc0703c77184184e05c53d21649f6b92e
Closes-Bug: #1843826

hooks/utils.py

@@ -1009,12 +1009,12 @@ def setup_ocf_files():
     # Xenial corosync is not creating this directory
     mkdir('/etc/corosync/uidgid.d')
 
-    rsync('ocf/ceph/rbd', '/usr/lib/ocf/resource.d/ceph/rbd')
-    rsync('ocf/maas/dns', '/usr/lib/ocf/resource.d/maas/dns')
-    rsync('ocf/maas/maas_dns.py', '/usr/lib/heartbeat/maas_dns.py')
-    rsync('ocf/maas/maasclient/', '/usr/lib/heartbeat/maasclient/')
+    rsync('files/ocf/ceph/rbd', '/usr/lib/ocf/resource.d/ceph/rbd')
+    rsync('files/ocf/maas/dns', '/usr/lib/ocf/resource.d/maas/dns')
+    rsync('files/ocf/maas/maas_dns.py', '/usr/lib/heartbeat/maas_dns.py')
+    rsync('files/ocf/maas/maasclient/', '/usr/lib/heartbeat/maasclient/')
     rsync(
-        'ocf/maas/maas_stonith_plugin.py',
+        'files/ocf/maas/maas_stonith_plugin.py',
         '/usr/lib/stonith/plugins/external/maas')
 
 

test-requirements.txt

@@ -12,7 +12,7 @@ requests>=2.18.4
 amulet>=1.14.3,<2.0;python_version=='2.7'
 bundletester>=0.6.1,<1.0;python_version=='2.7'
 python-ceilometerclient>=1.5.0
-python-cinderclient>=1.4.0
+python-cinderclient>=1.4.0,<5.0  # Train cinderclient removes v1.client
 python-glanceclient>=1.1.0
 python-heatclient>=0.8.0
 python-keystoneclient>=1.7.1

tox.ini

@@ -39,7 +39,7 @@ deps = -r{toxinidir}/requirements.txt
 basepython = python3
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-commands = flake8 {posargs} hooks unit_tests tests actions lib ocf/maas
+commands = flake8 {posargs} hooks unit_tests tests actions lib files
            charm-proof
 
 [testenv:venv]