← Back to branch summary

~rlane/nova/lp773690

« back to all changes in this revision

Viewing changes to nova/virt/libvirt.xml.template

  • Committer: rlane at wikimedia
  • Date: 2011-01-27 12:17:43 UTC
  • mfrom: (382.1.252 nova)
  • Revision ID: rlane@wikimedia.org-20110127121743-imwx28difrjvnzrq
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/libvirt.xml.template
75
75
            <!--   <model type='virtio'/>  CANT RUN virtio network right now -->
76
76
            <filterref filter="nova-instance-${name}">
77
77
                <parameter name="IP" value="${ip_address}" />
78
 
                <parameter name="DHCPSERVER" value="${dhcp_server}" />
79
 
                <parameter name="RASERVER" value="${ra_server}" />
 
78
                <parameter name="DHCPSERVER" value="${dhcp_server}" />           
80
79
#if $getVar('extra_params', False)
81
80
                ${extra_params}
82
81
#end if
 
82
#if $getVar('ra_server', False)
 
83
                <parameter name="RASERVER" value="${ra_server}" />
 
84
#end if
83
85
            </filterref>
84
86
        </interface>
85
87