Code review comment for lp:~zulcss/nova/nova-lxc

termie mentioned this, but it appears that the following is all due to a bad merge:

         <interface type='bridge'>
255 - <source bridge='${nic.bridge_name}'/>
256 - <mac address='${nic.mac_address}'/>
257 + <source bridge='${bridge_name}'/>
258 + <mac address='${mac_address}'/>
259 <!-- <model type='virtio'/> CANT RUN virtio network right now -->
260 - <filterref filter="nova-instance-${name}-${nic.id}">
261 - <parameter name="IP" value="${nic.ip_address}" />
262 - <parameter name="DHCPSERVER" value="${nic.dhcp_server}" />
263 -#if $getVar('nic.extra_params', False)
264 - ${nic.extra_params}
265 + <filterref filter="nova-instance-${name}">
266 + <parameter name="IP" value="${ip_address}" />
267 + <parameter name="DHCPSERVER" value="${dhcp_server}" />
268 +#if $getVar('extra_params', False)
269 + ${extra_params}
270 #end if
271 -#if $getVar('nic.gateway_v6', False)
272 - <parameter name="RASERVER" value="${nic.gateway_v6}" />
273 +#if $getVar('gateway_v6', False)
274 + <parameter name="RASERVER" value="${gateway_v6}" />
275 #end if