Revision 5805fbb1 snf-cyclades-app/synnefo/quotas/__init__.py

b/snf-cyclades-app/synnefo/quotas/__init__.py
156 156
def get_server_resources(flavor):
157 157
    return {'vm': 1,
158 158
            'cpu': flavor.cpu,
159
            'disk': flavor.disk,
159
            'disk': 1073741824 * flavor.disk,  # flavor.disk is in GB
160 160
            # 'public_ip': 1,
161 161
            #'disk_template': flavor.disk_template,
162
            'ram': flavor.ram}
162
            'ram': 1048576 * flavor.ram}  # flavor.ram is in MB
163 163

  
164 164

  
165 165
def issue_network_commission(user, delete=False):

Also available in: Unified diff