openstack/charm-cinder
Code Issues Proposed changes

Add rbd.py and rados.py symlinks and drop python-cephclient

Browse Source
This commit is contained in:
Corey Bryant 2015-05-12 20:43:48 +00:00
parent 48a9855175
commit 222a0e66f7
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hooks/cinder_utils.py
View File

@ -575,7 +575,7 @@ def git_pre_install():
def git_post_install(projects_yaml): def git_post_install(projects_yaml):
"""Perform cinder post-install setup.""" """Perform cinder post-install setup."""
http_proxy = git_yaml_value(projects_yaml, 'http_proxy') http_proxy = git_yaml_value(projects_yaml, 'http_proxy')
base_packages = ['mysql-python', 'python-cephclient'] base_packages = ['mysql-python']
for pkg in base_packages: for pkg in base_packages:
if http_proxy: if http_proxy:
pip_install(pkg, proxy=http_proxy, pip_install(pkg, proxy=http_proxy,
@ -602,6 +602,14 @@ def git_post_install(projects_yaml):
{'src': os.path.join(git_pip_venv_dir(projects_yaml), {'src': os.path.join(git_pip_venv_dir(projects_yaml),
'bin/cinder-rootwrap'), 'bin/cinder-rootwrap'),
'link': '/usr/local/bin/cinder-rootwrap'}, 'link': '/usr/local/bin/cinder-rootwrap'},
# NOTE(coreycb): This is ugly but couldn't find pypi package that
# installs rbd.py and rados.py.
{'src': '/usr/lib/python2.7/dist-packages/rbd.py',
'link': os.path.join(git_pip_venv_dir(projects_yaml),
'lib/python2.7/site-packages/rbd.py')},
{'src': '/usr/lib/python2.7/dist-packages/rados.py',
'link': os.path.join(git_pip_venv_dir(projects_yaml),
'lib/python2.7/site-packages/rados.py')},
] ]
for s in symlinks: for s in symlinks:

2
unit_tests/test_cinder_utils.py
View File

@ -596,6 +596,8 @@ class TestCinderUtils(CharmTestCase):
expected = [ expected = [
call('joined-string', '/usr/local/bin/cinder-manage'), call('joined-string', '/usr/local/bin/cinder-manage'),
call('/usr/lib/python2.7/dist-packages/rbd.py', 'joined-string'),
call('/usr/lib/python2.7/dist-packages/rados.py', 'joined-string'),
] ]
symlink.assert_has_calls(expected, any_order=True) symlink.assert_has_calls(expected, any_order=True)