openstack/charm-cinder
Code Issues Proposed changes

Move deploy from source template files to templates/git

Browse Source
This commit is contained in:
Corey Bryant 2015-04-13 13:49:53 +00:00
parent 9985e567d8
commit d33070988d
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hooks/cinder_utils.py
View File

@ -603,13 +603,13 @@ def git_post_install(projects_yaml):
os.chown('/etc/cinder/api-paste.ini', uid, gid) os.chown('/etc/cinder/api-paste.ini', uid, gid)
os.chown('/etc/cinder/policy.json', uid, gid) os.chown('/etc/cinder/policy.json', uid, gid)
render('cinder_tgt.conf', '/etc/tgt/conf.d', {}, owner='cinder',
group='cinder', perms=0o644)
render('cinder.conf', '/etc/cinder/cinder.conf', {}, owner='cinder', render('cinder.conf', '/etc/cinder/cinder.conf', {}, owner='cinder',
group='cinder', perms=0o644) group='cinder', perms=0o644)
render('logging.conf', '/etc/cinder/logging.conf', {}, owner='cinder', render('git/cinder_tgt.conf', '/etc/tgt/conf.d', {}, owner='cinder',
group='cinder', perms=0o644) group='cinder', perms=0o644)
render('cinder_sudoers', '/etc/sudoers.d/cinder_sudoers', {}, render('git/logging.conf', '/etc/cinder/logging.conf', {}, owner='cinder',
group='cinder', perms=0o644)
render('git/cinder_sudoers', '/etc/sudoers.d/cinder_sudoers', {},
owner='root', group='root', perms=0o440) owner='root', group='root', perms=0o440)
os.chmod('/etc/sudoers.d', 0o750) os.chmod('/etc/sudoers.d', 0o750)

0
templates/cinder_sudoers → templates/git/cinder_sudoers
View File

0
templates/cinder_tgt.conf → templates/git/cinder_tgt.conf
View File

0
templates/logging.conf → templates/git/logging.conf
View File

8
unit_tests/test_cinder_utils.py
View File

@ -638,13 +638,13 @@ class TestCinderUtils(CharmTestCase):
'log_file': '/var/log/cinder/cinder-volume.log', 'log_file': '/var/log/cinder/cinder-volume.log',
} }
expected = [ expected = [
call('cinder_tgt.conf', '/etc/tgt/conf.d', {}, owner='cinder',
group='cinder', perms=0o644),
call('cinder.conf', '/etc/cinder/cinder.conf', {}, owner='cinder', call('cinder.conf', '/etc/cinder/cinder.conf', {}, owner='cinder',
group='cinder', perms=0o644), group='cinder', perms=0o644),
call('logging.conf', '/etc/cinder/logging.conf', {}, call('git/cinder_tgt.conf', '/etc/tgt/conf.d', {}, owner='cinder',
group='cinder', perms=0o644),
call('git/logging.conf', '/etc/cinder/logging.conf', {},
owner='cinder', group='cinder', perms=0o644), owner='cinder', group='cinder', perms=0o644),
call('cinder_sudoers', '/etc/sudoers.d/cinder_sudoers', {}, call('git/cinder_sudoers', '/etc/sudoers.d/cinder_sudoers', {},
owner='root', group='root', perms=0o440), owner='root', group='root', perms=0o440),
call('git.upstart', '/etc/init/cinder-api.conf', call('git.upstart', '/etc/init/cinder-api.conf',
cinder_api_context, perms=0o644, cinder_api_context, perms=0o644,