x/gantt
Code Issues Proposed changes

Merge "Enable admin access to EC2 API server"

Browse Source
This commit is contained in:
Jenkins
2011-11-03 14:45:11 +00:00
committed by Gerrit Code Review
parent 0c71401866 e84424404b
commit b8b2481bf2
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/exception.py
View File

@@ -206,6 +206,10 @@ class Invalid(NovaException):
message = _("Unacceptable parameters.") message = _("Unacceptable parameters.")
class InvalidRequest(Invalid):
message = _("The request is invalid.")
class InvalidSignature(Invalid): class InvalidSignature(Invalid):
message = _("Invalid signature %(signature)s for user %(user)s.") message = _("Invalid signature %(signature)s for user %(user)s.")

2
nova/flags.py
View File

@@ -474,3 +474,5 @@ DEFINE_integer('reclaim_instance_interval', 0,
DEFINE_integer('zombie_instance_updated_at_window', 172800, DEFINE_integer('zombie_instance_updated_at_window', 172800,
'Limit in seconds that a zombie instance can exist before ' 'Limit in seconds that a zombie instance can exist before '
'being cleaned up.') 'being cleaned up.')
DEFINE_boolean('allow_ec2_admin_api', False, 'Enable/Disable EC2 Admin API')