From aa292323257d188b6a99c4e98987b643f8ed6aa9 Mon Sep 17 00:00:00 2001
From: James Page <james.page@canonical.com>
Date: Tue, 22 Oct 2013 15:31:38 -0700
Subject: [PATCH] Force neutron security for NVP

---
 templates/folsom/nova.conf | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/templates/folsom/nova.conf b/templates/folsom/nova.conf
index b74e7a1d..414e6ea7 100644
--- a/templates/folsom/nova.conf
+++ b/templates/folsom/nova.conf
@@ -58,10 +58,8 @@ default_floating_pool = {{ external_network }}
 {% endif -%}
 
 {% if neutron_plugin and neutron_plugin == 'nvp' -%}
-{% if neutron_security_groups -%}
-security_group_api = {{ network_manager }}
+security_group_api = neutron
 nova_firewall_driver = nova.virt.firewall.NoopFirewallDriver
-{% endif -%}
 {% if external_network -%}
 default_floating_pool = {{ external_network }}
 {% endif -%}