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

read availability_zone from config if its set in config file. If not set by user or config then raise error #111

Closed
wants to merge 1 commit into from
Closed

read availability_zone from config if its set in config file. If not set by user or config then raise error #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions jumpgate/common/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
cfg.StrOpt('default_ram', default=512000),
cfg.StrOpt('default_security_group_rules', default=20),
cfg.StrOpt('default_security_groups', default=10),
cfg.StrOpt('default_availability_zone', default=None),
],
'image': [
cfg.StrOpt('driver', default='jumpgate.image.drivers.sl'),
Expand Down
7 changes: 6 additions & 1 deletion jumpgate/compute/drivers/sl/servers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,14 @@ def on_post(self, req, resp, tenant_id):
datacenter = None
if lookup(body, 'server', 'availability_zone'):
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For clarity, thThis could be simplified to:

        datacenter = (lookup(body, 'server', 'availability_zone') or
                      CONF['compute']['default_availability_zone'])

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

datacenter = lookup(body, 'server', 'availability_zone')
else:
if "default_availability_zone" in CONF['compute'].keys():
datacenter = CONF['compute']["default_availability_zone"]

cci = CCIManager(client)
if not datacenter:
return bad_request(resp, 'availability-zone missing')

cci = CCIManager(client)
payload = {
'hostname': body['server']['name'],
'domain': CONF['default_domain'] or 'jumpgate.com',
Expand Down