Revision 1f3ad141
b/snf-astakos-app/README | ||
---|---|---|
94 | 94 |
ASTAKOS_QUOTA_HOLDER_URL '' The quota holder URI |
95 | 95 |
e.g. ``http://localhost:8080/api/quotaholder/v`` |
96 | 96 |
ASTAKOS_SERVICES {'cyclades': {'resources': [{'desc': 'Number of virtual machines', Default cloud service information |
97 |
'group': 'storage',
|
|
97 |
'group': 'compute',
|
|
98 | 98 |
'name': 'vm', |
99 | 99 |
'uplimit': 2}, |
100 | 100 |
{'desc': 'Virtual machine disk size', |
101 |
'group': 'storage',
|
|
102 |
'name': 'disksize',
|
|
101 |
'group': 'compute',
|
|
102 |
'name': 'diskspace',
|
|
103 | 103 |
'unit': 'GB', |
104 | 104 |
'uplimit': 5}, |
105 | 105 |
{'desc': 'Number of virtual machine processors', |
106 |
'group': 'storage',
|
|
106 |
'group': 'compute',
|
|
107 | 107 |
'name': 'cpu', |
108 | 108 |
'uplimit': 1}, |
109 | 109 |
{'desc': 'Virtual machines', |
110 |
'group': 'storage',
|
|
110 |
'group': 'compute',
|
|
111 | 111 |
'name': 'ram', |
112 | 112 |
'unit': 'MB', |
113 | 113 |
'uplimit': 1024}], |
114 | 114 |
'url': 'https://node1.example.com/ui/'}, |
115 | 115 |
'pithos+': {'resources': [{'desc': 'Pithos account diskspace', |
116 |
'group': 'compute',
|
|
116 |
'group': 'storage',
|
|
117 | 117 |
'name': 'diskspace', |
118 | 118 |
'unit': 'bytes', |
119 | 119 |
'uplimit': 5368709120}], |
b/snf-astakos-app/astakos/im/migrations/0030_populate_resource_data.py | ||
---|---|---|
37 | 37 |
name=rn, |
38 | 38 |
defaults=r) |
39 | 39 |
except Exception, e: |
40 |
logger.exception(e) |
|
41 | 40 |
print "Cannot create resource ", rn |
42 | 41 |
continue |
43 | 42 |
|
... | ... | |
61 | 60 |
for r in resources: |
62 | 61 |
rn = r.get('name', '') |
63 | 62 |
try: |
63 |
q = orm.AstakosGroupQuota.objects.get( |
|
64 |
group=default, |
|
65 |
resource__name=rn) |
|
66 |
q.delete() |
|
64 | 67 |
q = orm.Resource.objects.get(service__name=sn, name=rn) |
65 | 68 |
q.delete() |
66 |
except orm.Resource.DoesNotExist: |
|
69 |
except Exception, e: |
|
70 |
print "Cannot create resource ", rn |
|
67 | 71 |
continue |
68 | 72 |
|
69 | 73 |
map(destroy_policies, SERVICES.iteritems()) |
b/snf-astakos-app/astakos/im/settings.py | ||
---|---|---|
137 | 137 |
'url': 'https://node1.example.com/ui/', |
138 | 138 |
'resources': [{ |
139 | 139 |
'name':'vm', |
140 |
'group':'storage',
|
|
140 |
'group':'compute',
|
|
141 | 141 |
'uplimit':2, |
142 | 142 |
'desc': 'Number of virtual machines' |
143 | 143 |
},{ |
144 | 144 |
'name':'disksize', |
145 |
'group':'storage',
|
|
145 |
'group':'compute',
|
|
146 | 146 |
'uplimit':5, |
147 | 147 |
'unit':'GB', |
148 | 148 |
'desc': 'Virtual machine disk size' |
149 | 149 |
},{ |
150 | 150 |
'name':'cpu', |
151 |
'group':'storage',
|
|
151 |
'group':'compute',
|
|
152 | 152 |
'uplimit':1, |
153 | 153 |
'desc': 'Number of virtual machine processors' |
154 | 154 |
},{ |
155 | 155 |
'name':'ram', |
156 |
'group':'storage',
|
|
156 |
'group':'compute',
|
|
157 | 157 |
'uplimit':1024, |
158 | 158 |
'unit':'MB', |
159 | 159 |
'desc': 'Virtual machines' |
... | ... | |
163 | 163 |
'url': 'https://node2.example.com/ui/', |
164 | 164 |
'resources':[{ |
165 | 165 |
'name':'diskspace', |
166 |
'group':'compute',
|
|
166 |
'group':'storage',
|
|
167 | 167 |
'uplimit':5 * 1024 * 1024 * 1024, |
168 | 168 |
'unit':'bytes', |
169 | 169 |
'desc': 'Pithos account diskspace' |
Also available in: Unified diff