Merge "Enable admin access to EC2 API server"

nova/exception.py

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

nova/flags.py

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