From 559296a537d16903a9cfe39290e130248166c1e0 Mon Sep 17 00:00:00 2001
From: Matthew Booth <mbooth@redhat.com>
Date: Thu, 29 Jan 2015 11:08:37 +0000
Subject: [PATCH] Revert "Raise if sec-groups and port id are provided on boot"

This reverts commit d8cafb9a6efb95b78609aca8fcb3532c33a1788f.

The above commit assumes that security_groups can be empty. However,
it will always have had the default security_group added to it,
meaning that with this patch it is never possible to specify a port
it.

Closes-bug: #1415835
Change-Id: I01b561ac8b9b29cc4721d88567678a42a4fd1f6b
---
 nova/exception.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/nova/exception.py b/nova/exception.py
index 9b0bf3ef..b917d3a1 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -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