openstack/charm-neutron-openvswitch
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:08:56 +00:00
parent 810ee59f6e
commit 42001f843c
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hooks/neutron_ovs_utils.py
View File

@ -268,7 +268,7 @@ def git_post_install(projects_yaml):
for conf, files in configs.iteritems():
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)
neutron_ovs_agent_context = {
@ -288,10 +288,10 @@ def git_post_install(projects_yaml):
}
# NOTE(coreycb): Needs systemd support
render('upstart/neutron-plugin-openvswitch-agent.upstart',
render('git/upstart/neutron-plugin-openvswitch-agent.upstart',
'/etc/init/neutron-plugin-openvswitch-agent.conf',
neutron_ovs_agent_context, perms=0o644)
render('upstart/neutron-ovs-cleanup.upstart',
render('git/upstart/neutron-ovs-cleanup.upstart',
'/etc/init/neutron-ovs-cleanup.conf',
neutron_ovs_cleanup_context, perms=0o644)

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

0
templates/upstart/neutron-ovs-cleanup.upstart → templates/git/upstart/neutron-ovs-cleanup.upstart
View File

0
templates/upstart/neutron-plugin-openvswitch-agent.upstart → templates/git/upstart/neutron-plugin-openvswitch-agent.upstart
View File

6
unit_tests/test_neutron_ovs_utils.py
View File

@ -295,12 +295,12 @@ class TestNeutronOVSUtils(CharmTestCase):
'log_file': '/var/log/neutron/ovs-cleanup.log',
}
expected = [
call('neutron_sudoers', '/etc/sudoers.d/neutron_sudoers', {},
call('git/neutron_sudoers', '/etc/sudoers.d/neutron_sudoers', {},
perms=0o440),
call('upstart/neutron-plugin-openvswitch-agent.upstart',
call('git/upstart/neutron-plugin-openvswitch-agent.upstart',
'/etc/init/neutron-plugin-openvswitch-agent.conf',
neutron_ovs_agent_context, perms=0o644),
call('upstart/neutron-ovs-cleanup.upstart',
call('git/upstart/neutron-ovs-cleanup.upstart',
'/etc/init/neutron-ovs-cleanup.conf',
neutron_ovs_cleanup_context, perms=0o644),
]