Revision 61868190

b/README.develop
99 99
16.As is.
100 100

  
101 101

  
102
17.[OPTIONAL] Create settings.d/99-local.conf and insert local overrides for
103
   settings.d/*.  This will allow pulling new files without needing to reapply
104
   local any local modifications.
105

  
106

  
102 107
South Database Migrations
103 108
=========================
104 109

  
b/logic/backend.py
158 158
def create_instance(vm, flavor, image, password):
159 159

  
160 160
    nic = {'ip': 'pool', 'mode': 'routed', 'link': settings.GANETI_PUBLIC_LINK}
161
    
162
    if image.backend_id.find("windows") >= 0:
163
        sz = 14000
161

  
162
    if settings.IGNORE_FLAVOR_DISK_SIZES:
163
        if image.backend_id.find("windows") >= 0:
164
            sz = 14000
165
        else:
166
            sz = 4000
164 167
    else:
165
        sz = 4000
168
        sz = flavor.disk * 1024
166 169

  
167 170
    return rapi.CreateInstance(
168 171
        mode='create',
......
176 179
        # Do not specific a node explicitly, have
177 180
        # Ganeti use an iallocator instead
178 181
        #
179
        # pnode=rapi.GetNodes()[0]
182
        # pnode=rapi.GetNodes()[0],
180 183
        dry_run=settings.TEST,
181 184
        beparams=dict(auto_balance=True, vcpus=flavor.cpu, memory=flavor.ram),
182 185
        osparams=dict(img_id=image.backend_id, img_passwd=password,
b/settings.d/20-api.conf
79 79
# our REST API would prefer to be explicit about trailing slashes
80 80
APPEND_SLASH = False
81 81

  
82
# Ignore disk size specified by flavor, always build the
83
# machine with a 4GB (in the case of Windows: 14GB) disk.
84
# This setting is helpful in development setups.
85
#
86
IGNORE_FLAVOR_DISK_SIZES = False
87

  
88
# Quota
89
#
82 90
# Maximum number of VMs a user is allowed to have
83 91
MAX_VMS_PER_USER = 2
84 92

  

Also available in: Unified diff