From a33cdbf19afcf78d287b98b0301cec3d49f3a65c Mon Sep 17 00:00:00 2001
From: James Page <james.page@canonical.com>
Date: Tue, 22 Oct 2013 15:30:06 -0700
Subject: [PATCH] Fixup template for nvp

---
 .project                   |  2 +-
 .pydevproject              |  4 ++--
 templates/folsom/nova.conf | 10 ++++++++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/.project b/.project
index 97aa0f99..22e90774 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>nova-cloud-controller</name>
+	<name>nvp-nova-cloud-controller</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/.pydevproject b/.pydevproject
index 3b124098..90f0dd85 100644
--- a/.pydevproject
+++ b/.pydevproject
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?eclipse-pydev version="1.0"?><pydev_project>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
-<path>/nova-cloud-controller/hooks</path>
-<path>/nova-cloud-controller/unit_tests</path>
+<path>/nvp-nova-cloud-controller/hooks</path>
+<path>/nvp-nova-cloud-controller/unit_tests</path>
 </pydev_pathproperty>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
diff --git a/templates/folsom/nova.conf b/templates/folsom/nova.conf
index a7b79254..b74e7a1d 100644
--- a/templates/folsom/nova.conf
+++ b/templates/folsom/nova.conf
@@ -57,6 +57,16 @@ default_floating_pool = {{ external_network }}
 {% endif -%}
 {% endif -%}
 
+{% if neutron_plugin and neutron_plugin == 'nvp' -%}
+{% if neutron_security_groups -%}
+security_group_api = {{ network_manager }}
+nova_firewall_driver = nova.virt.firewall.NoopFirewallDriver
+{% endif -%}
+{% if external_network -%}
+default_floating_pool = {{ external_network }}
+{% endif -%}
+{% endif -%}
+
 {% if network_manager_config -%}
 {% for key, value in network_manager_config.iteritems() -%}
 {{ key }} = {{ value }}