openstack/charm-neutron-api
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 14:06:14 +00:00
parent 03bdfbae23
commit 864216f5b9
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hooks/neutron_api_utils.py
View File

@ -392,7 +392,7 @@ def git_post_install(projects_yaml):
for conf, files in configs.iteritems(): for conf, files in configs.iteritems():
shutil.copyfile(files['src'], files['dest']) shutil.copyfile(files['src'], files['dest'])
render('neutron_sudoers', '/etc/sudoers.d/neutron_sudoers', {}, render('git/neutron_sudoers', '/etc/sudoers.d/neutron_sudoers', {},
perms=0o440) perms=0o440)
neutron_api_context = { neutron_api_context = {
@ -402,7 +402,8 @@ def git_post_install(projects_yaml):
} }
# NOTE(coreycb): Needs systemd support # NOTE(coreycb): Needs systemd support
render('upstart/neutron-server.upstart', '/etc/init/neutron-server.conf', render('git/upstart/neutron-server.upstart',
'/etc/init/neutron-server.conf',
neutron_api_context, perms=0o644) neutron_api_context, perms=0o644)
service_restart('neutron-server') service_restart('neutron-server')

0
templates/neutron_sudoers → templates/git/neutron_sudoers
View File

0
templates/upstart/neutron-server.upstart → templates/git/upstart/neutron-server.upstart
View File

4
unit_tests/test_neutron_api_utils.py
View File

@ -272,9 +272,9 @@ class TestNeutronAPIUtils(CharmTestCase):
'process_name': 'neutron-server', 'process_name': 'neutron-server',
} }
expected = [ expected = [
call('neutron_sudoers', '/etc/sudoers.d/neutron_sudoers', {}, call('git/neutron_sudoers', '/etc/sudoers.d/neutron_sudoers', {},
perms=0o440), perms=0o440),
call('upstart/neutron-server.upstart', call('git/upstart/neutron-server.upstart',
'/etc/init/neutron-server.conf', '/etc/init/neutron-server.conf',
neutron_api_context, perms=0o644), neutron_api_context, perms=0o644),
] ]