openstack/charm-nova-cloud-controller
Code Issues Proposed changes

Fixup template for nvp

Browse Source
This commit is contained in:
James Page 2013-10-22 15:30:06 -07:00
parent d86ea9fc0e
commit a33cdbf19a
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.project
View File

@ -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>

4
.pydevproject
View File

@ -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>

10
templates/folsom/nova.conf
View File

@ -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 }}