stackforge/openvz-nova-driver
Code Issues Proposed changes

Use jinja template (via nova) instead of cheetah for network interface file

Browse Source 
Change-Id: Ib2855b3d4dd5e2ff98b9cf6f5d1d7c96ceb6fb00
This commit is contained in:
Paul Marshall 2013-10-29 15:33:43 -05:00
parent 0b3c82ebd7
commit 700e4216d1
2 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ovznovadriver/openvz/driver.py
View File

@ -1165,7 +1165,7 @@ class OpenVzDriver(driver.ComputeDriver):
LOG.debug(_('network_info: %s') % network_info)
interfaces = ovz_utils.generate_network_dict(instance['id'],
network_info)
ifaces_fh = ovznetwork.OVZNetworkInterfaces(interfaces)
ifaces_fh = ovznetwork.OVZNetworkInterfaces(interfaces, network_info)
ifaces_fh.add()
def plug_vifs(self, instance, network_info):

26
ovznovadriver/openvz/network.py
View File

@ -20,9 +20,9 @@ A driver specific to OpenVz as the support for Ovz in libvirt
is sketchy at best.
"""
from Cheetah import Template
from nova import exception
from nova.openstack.common import log as logging
from nova.virt import netutils
from ovznovadriver.localization import _
from ovznovadriver.openvz import file as ovzfile
from ovznovadriver.openvz.file_ext import boot as ovzboot
@ -41,11 +41,12 @@ class OVZNetworkInterfaces(object):
Helper class for managing interfaces in OpenVz
"""
#TODO(imsplitbit): fix this to work with redhat based distros
def __init__(self, interface_info):
def __init__(self, interface_info, network_info=None):
"""
Manage the network interfaces for your OpenVz containers.
"""
self.interface_info = interface_info
self.network_info = network_info
LOG.debug(_('Interface info: %s') % self.interface_info)
self.boot_file = ovzboot.OVZBootFile(self.interface_info[0]['id'], 755)
with self.boot_file:
@ -72,7 +73,6 @@ class OVZNetworkInterfaces(object):
with self.shutdown_file:
self.shutdown_file.append(tc_rules.container_stop())
self._load_template()
self._fill_templates()
else:
for net_dev in self.interface_info:
@ -87,31 +87,19 @@ class OVZNetworkInterfaces(object):
self._set_nameserver(self.interface_info[0]['id'],
self.interface_info[0]['dns'])
def _load_template(self):
"""
Load templates needed for network interfaces.
"""
if CONF.ovz_use_veth_devs:
# TODO(imsplitbit): make a cheatah template for dhcp networking
self.template = open(CONF.injected_network_template).read()
else:
self.template = None
def _fill_templates(self):
"""
Iterate through each file necessary for creating interfaces on a
given platform, open the file and write the contents of the template
to the file.
"""
iface_file = netutils.get_injected_network_template(self.network_info,
use_ipv6=CONF.use_ipv6,
template=CONF.injected_network_template)
for filename in self._filename_factory():
network_file = OVZNetworkFile(filename)
self.iface_file = str(
Template.Template(self.template,
searchList=[
{'interfaces': self.interface_info,
'use_ipv6': CONF.use_ipv6}]))
with network_file:
network_file.append(self.iface_file.split('\n'))
network_file.append(iface_file)
network_file.write()
def _filename_factory(self, variant='debian'):