openstack/charm-neutron-gateway
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:24:40 +00:00
parent 3a1c1b2007
commit e81544c224
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hooks/quantum_utils.py
View File

@ -1046,13 +1046,13 @@ def git_post_install(projects_yaml):
os.remove(s['link'])
os.symlink(s['src'], s['link'])
render('neutron_sudoers',
render('git/neutron_sudoers',
'/etc/sudoers.d/neutron_sudoers', {}, perms=0o440)
render('cron.d/neutron-dhcp-agent-netns-cleanup',
render('git/cron.d/neutron-dhcp-agent-netns-cleanup',
'/etc/cron.d/neutron-dhcp-agent-netns-cleanup', {}, perms=0o755)
render('cron.d/neutron-l3-agent-netns-cleanup',
render('git/cron.d/neutron-l3-agent-netns-cleanup',
'/etc/cron.d/neutron-l3-agent-netns-cleanup', {}, perms=0o755)
render('cron.d/neutron-lbaas-agent-netns-cleanup',
render('git/cron.d/neutron-lbaas-agent-netns-cleanup',
'/etc/cron.d/neutron-lbaas-agent-netns-cleanup', {}, perms=0o755)
service_name = 'quantum-gateway'
@ -1242,10 +1242,10 @@ def git_post_install(projects_yaml):
# NOTE(coreycb): Needs systemd support
templates_dir = 'hooks/charmhelpers/contrib/openstack/templates'
templates_dir = os.path.join(charm_dir(), templates_dir)
render('upstart/neutron-agent.upstart',
render('git/upstart/neutron-agent.upstart',
'/etc/init/neutron-dhcp-agent.conf',
neutron_dhcp_agent_context, perms=0o644)
render('upstart/neutron-agent.upstart',
render('git/upstart/neutron-agent.upstart',
'/etc/init/neutron-l3-agent.conf',
neutron_l3_agent_context, perms=0o644)
render('git.upstart',
@ -1304,10 +1304,10 @@ def git_post_install(projects_yaml):
'/etc/init/neutron-plugin-sriov-agent.conf',
neutron_plugin_sriov_context, perms=0o644,
templates_dir=templates_dir)
render('upstart/neutron-server.upstart',
render('git/upstart/neutron-server.upstart',
'/etc/init/neutron-server.conf',
neutron_api_context, perms=0o644)
render('upstart/neutron-agent.upstart',
render('git/upstart/neutron-agent.upstart',
'/etc/init/neutron-vpn-agent.conf',
neutron_vpn_agent_context, perms=0o644)

0
templates/cron.d/neutron-dhcp-agent-netns-cleanup → templates/git/cron.d/neutron-dhcp-agent-netns-cleanup
View File

0
templates/cron.d/neutron-l3-agent-netns-cleanup → templates/git/cron.d/neutron-l3-agent-netns-cleanup
View File

0
templates/cron.d/neutron-lbaas-agent-netns-cleanup → templates/git/cron.d/neutron-lbaas-agent-netns-cleanup
View File

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

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

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

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

16
unit_tests/test_quantum_utils.py
View File

@ -1041,22 +1041,22 @@ class TestQuantumAgentReallocation(CharmTestCase):
'log_file': '/var/log/neutron/vpn_agent.log',
}
expected = [
call('neutron_sudoers',
call('git/neutron_sudoers',
'/etc/sudoers.d/neutron_sudoers',
{}, perms=0o440),
call('cron.d/neutron-dhcp-agent-netns-cleanup',
call('git/cron.d/neutron-dhcp-agent-netns-cleanup',
'/etc/cron.d/neutron-dhcp-agent-netns-cleanup',
{}, perms=0o755),
call('cron.d/neutron-l3-agent-netns-cleanup',
call('git/cron.d/neutron-l3-agent-netns-cleanup',
'/etc/cron.d/neutron-l3-agent-netns-cleanup',
{}, perms=0o755),
call('cron.d/neutron-lbaas-agent-netns-cleanup',
call('git/cron.d/neutron-lbaas-agent-netns-cleanup',
'/etc/cron.d/neutron-lbaas-agent-netns-cleanup',
{}, perms=0o755),
call('upstart/neutron-agent.upstart',
call('git/upstart/neutron-agent.upstart',
'/etc/init/neutron-dhcp-agent.conf',
neutron_dhcp_agent_context, perms=0o644),
call('upstart/neutron-agent.upstart',
call('git/upstart/neutron-agent.upstart',
'/etc/init/neutron-l3-agent.conf',
neutron_l3_agent_context, perms=0o644),
call('git.upstart',
@ -1115,10 +1115,10 @@ class TestQuantumAgentReallocation(CharmTestCase):
'/etc/init/neutron-plugin-sriov-agent.conf',
neutron_plugin_sriov_context, perms=0o644,
templates_dir='joined-string'),
call('upstart/neutron-server.upstart',
call('git/upstart/neutron-server.upstart',
'/etc/init/neutron-server.conf',
neutron_api_context, perms=0o644),
call('upstart/neutron-agent.upstart',
call('git/upstart/neutron-agent.upstart',
'/etc/init/neutron-vpn-agent.conf',
neutron_vpn_agent_context, perms=0o644),
]