Merge "Revert "Raise if sec-groups and port id are provided on boot""

This commit is contained in:
Jenkins
2015-01-30 21:05:10 +00:00
committed by Gerrit Code Review

View File

@@ -991,12 +991,6 @@ class SecurityGroupRuleExists(Invalid):
msg_fmt = _("Rule already exists in group: %(rule)s")
class SecurityGroupNotAllowedTogetherWithPort(Invalid):
msg_fmt = _("It's not allowed to specify security groups if port_id "
"is provided on instance boot. Neutron should be used to "
"configure security groups on port.")
class NoUniqueMatch(NovaException):
msg_fmt = _("No Unique Match Found.")
code = 409