← Back to branch summary

~0x44/nova/extdoc

« back to all changes in this revision

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

  • Committer: Lvov Maxim
  • Date: 2011-07-26 05:50:05 UTC
  • mfrom: (1320 nova)
  • mto: This revision was merged to the branch mainline in revision 1322.
  • Revision ID: usrleon@gmail.com-20110726055005-7olsp0giqup3pao7
merge with trunk, resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/libvirt.xml.template
82
82
            </disk>
83
83
        #end if
84
84
        #for $vol in $volumes
85
 
            <disk type='block'>
 
85
            <disk type='${vol.type}'>
86
86
                <driver type='raw'/>
 
87
                #if $vol.type == 'network'
 
88
                <source protocol='${vol.protocol}' name='${vol.name}'/>
 
89
                #else
87
90
                <source dev='${vol.device_path}'/>
 
91
                #end if
88
92
                <target dev='${vol.mount_device}' bus='${disk_bus}'/>
89
93
            </disk>
90
94
        #end for