openstack/charm-hacluster
Code Issues Proposed changes

Standardize auxiliary file location across os-charms

Browse Source 
Change-Id: Ifaa5453bc0703c77184184e05c53d21649f6b92e
Closes-Bug: #1843826
This commit is contained in:
Ryan Beisner 2019-09-12 15:20:51 -05:00
parent 8767086714
commit 6ed2bb0943
No known key found for this signature in database
GPG Key ID: 952BACDC1C1A05FB
10 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
ocf/ceph/rbd → files/ocf/ceph/rbd
View File

0
ocf/maas/dns → files/ocf/maas/dns
View File

0
ocf/maas/maas_dns.py → files/ocf/maas/maas_dns.py
View File

0
ocf/maas/maas_stonith_plugin.py → files/ocf/maas/maas_stonith_plugin.py
View File

0
ocf/maas/maasclient/__init__.py → files/ocf/maas/maasclient/__init__.py
View File

0
ocf/maas/maasclient/apidriver.py → files/ocf/maas/maasclient/apidriver.py
View File

0
ocf/maas/maasclient/driver.py → files/ocf/maas/maasclient/driver.py
View File

10
hooks/utils.py
View File

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

2
test-requirements.txt
View File

@ -12,7 +12,7 @@ requests>=2.18.4
amulet>=1.14.3,<2.0;python_version=='2.7' amulet>=1.14.3,<2.0;python_version=='2.7'
bundletester>=0.6.1,<1.0;python_version=='2.7' bundletester>=0.6.1,<1.0;python_version=='2.7'
python-ceilometerclient>=1.5.0 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-glanceclient>=1.1.0
python-heatclient>=0.8.0 python-heatclient>=0.8.0
python-keystoneclient>=1.7.1 python-keystoneclient>=1.7.1

2
tox.ini
View File

@ -39,7 +39,7 @@ deps = -r{toxinidir}/requirements.txt
basepython = python3 basepython = python3
deps = -r{toxinidir}/requirements.txt deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-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 charm-proof
[testenv:venv] [testenv:venv]