Skip to content
This repository was archived by the owner on Nov 27, 2023. It is now read-only.

Commit dd9429e

Browse files
committed
Merge pull request #112 from Neetuj/dcissue
Data center info to config file #issue81
2 parents 43e37c2 + b79c171 commit dd9429e

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

jumpgate/common/config.py

+1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
cfg.StrOpt('default_ram', default=512000),
4949
cfg.StrOpt('default_security_group_rules', default=20),
5050
cfg.StrOpt('default_security_groups', default=10),
51+
cfg.StrOpt('default_availability_zone', default=None),
5152
],
5253
'image': [
5354
cfg.StrOpt('driver', default='jumpgate.image.drivers.sl'),

jumpgate/compute/drivers/sl/servers.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,10 @@ def on_post(self, req, resp, tenant_id):
204204
if lookup(body, 'server', 'personality'):
205205
user_data['personality'] = lookup(body, 'server', 'personality')
206206

207-
datacenter = None
208-
if lookup(body, 'server', 'availability_zone'):
209-
datacenter = lookup(body, 'server', 'availability_zone')
207+
datacenter = (lookup(body, 'server', 'availability_zone')
208+
or CONF['compute']['default_availability_zone'])
209+
if not datacenter:
210+
return bad_request(resp, 'availability_zone missing')
210211

211212
cci = CCIManager(client)
212213

0 commit comments

Comments
 (0)