← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandleman
  • Date: 2012-01-13 09:51:10 UTC
  • mfrom: (1.1.40)
  • Revision ID: package-import@ubuntu.com-20120113095110-ffd6163drcg77wez
Tags: 2012.1~e3~20120113.12049-0ubuntu1
https://launchpad.net/bugs/681774
https://launchpad.net/bugs/91379
https://launchpad.net/bugs/907543
[Chuck Short]
* New upstream version.
* debian/nova_sudoers, debian/nova-common.install, 
  Switch out to nova-rootwrap. (LP: #681774)
* Add "get-origsource-git" which allows developers to 
  generate a tarball from github, by doing:
  fakeroot debian/rules get-orig-source-git
* debian/debian/nova-objectstore.logrotate: Dont determine
  if we are running Debian or Ubuntu. (LP: #91379)

[Adam Gandleman]
* Removed python-nova.postinst, let dh_python2 generate instead since
  python-support is not a dependency. (LP: #907543)

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/virt/libvirt.xml.template
3
3
    <memory>${memory_kb}</memory>
4
4
    <os>
5
5
#if $type == 'lxc'
6
 
    #set $disk_bus = ''
7
6
        <type>exe</type>
8
7
        <init>/sbin/init</init>
9
8
#else if $type == 'uml'
10
 
    #set $disk_bus = 'uml'
 
9
    #set $root_disk_bus = 'uml'
 
10
    #set $ephemeral_disk_bus = 'uml'
11
11
        <type>uml</type>
12
12
        <kernel>/usr/bin/linux</kernel>
13
13
        #set $root_device_name = $getVar('root_device_name', '/dev/ubda')
14
14
        <root>${root_device_name}</root>
15
15
#else
16
16
    #if $type == 'xen'
17
 
        #set $disk_bus = 'scsi'
 
17
        #set $root_disk_bus = 'scsi'
 
18
        #set $ephemeral_disk_bus = 'scsi'
18
19
            <type>linux</type>
19
20
            #set $root_device_name = $getVar('root_device_name', '/dev/xvda')
20
21
            <root>${root_device_name}</root>
21
22
    #else
22
 
        #set $disk_bus = 'virtio'
 
23
        #set $ephemeral_disk_bus = 'virtio'
 
24
        #if $root_device_type == 'cdrom'
 
25
            #set $root_disk_bus = 'ide'
 
26
        #else
 
27
            #set $root_disk_bus = 'virtio'
 
28
        #end if
23
29
            <type>hvm</type>
24
30
    #end if
25
31
    #if $getVar('rescue', False)
58
64
        <disk type='file'>
59
65
            <driver type='${driver_type}'/>
60
66
            <source file='${basepath}/disk.rescue'/>
61
 
            <target dev='${disk_prefix}a' bus='${disk_bus}'/>
 
67
            <target dev='${disk_prefix}a' bus='${ephemeral_disk_bus}'/>
62
68
        </disk>
63
69
        <disk type='file'>
64
70
            <driver type='${driver_type}'/>
65
71
            <source file='${basepath}/disk'/>
66
 
            <target dev='${disk_prefix}b' bus='${disk_bus}'/>
 
72
            <target dev='${disk_prefix}b' bus='${ephemeral_disk_bus}'/>
67
73
        </disk>
68
74
    #else
69
75
        #if not ($getVar('ebs_root', False))
70
 
        <disk type='file'>
 
76
        <disk type='file' device='${root_device_type}'>
71
77
            <driver type='${driver_type}'/>
72
78
            <source file='${basepath}/disk'/>
73
 
            <target dev='${root_device}' bus='${disk_bus}'/>
 
79
            <target dev='${root_device}' bus='${root_disk_bus}'/>
74
80
        </disk>
75
81
        #end if
76
82
        #if $getVar('local_device', False)
77
83
            <disk type='file'>
78
84
                <driver type='${driver_type}'/>
79
85
                <source file='${basepath}/disk.local'/>
80
 
                <target dev='${local_device}' bus='${disk_bus}'/>
 
86
                <target dev='${local_device}' bus='${ephemeral_disk_bus}'/>
81
87
            </disk>
82
88
        #end if
83
89
        #for $eph in $ephemerals
84
90
         <disk type='block'>
85
91
                <driver type='${driver_type}'/>
86
92
                <source dev='${basepath}/${eph.device_path}'/>
87
 
                <target dev='${eph.device}' bus='${disk_bus}'/>
 
93
                <target dev='${eph.device}' bus='${ephemeral_disk_bus}'/>
88
94
         </disk>
89
95
        #end for
90
96
        #if $getVar('swap_device', False)
91
97
            <disk type='file'>
92
98
                <driver type='${driver_type}'/>
93
99
                <source file='${basepath}/disk.swap'/>
94
 
                <target dev='${swap_device}' bus='${disk_bus}'/>
 
100
                <target dev='${swap_device}' bus='${ephemeral_disk_bus}'/>
95
101
            </disk>
96
102
        #end if
97
103
        #for $vol in $volumes
102
108
        <disk type='file'>
103
109
            <driver type='raw' />
104
110
            <source file='${basepath}/disk.config' />
105
 
            <target dev='${disk_prefix}z' bus='${disk_bus}' />
 
111
            <target dev='${disk_prefix}z' bus='${ephemeral_disk_bus}' />
106
112
        </disk>
107
113
    #end if
108
114
#end if