Merge lp:~jpds/charms/precise/nova-cloud-controller/ncc-neutronclient into lp:~charmers/charms/precise/nova-cloud-controller/trunk

[Jonathan Davies]

Make nova-cloud-controller aware of the Neutron API so that we are able to do live migration.

[James Page (james-page)]

Why does this need to be applied in the neutron configuration file? Surely the neutron-server already knows about itself?

=== modified file 'templates/folsom/quantum.conf'
--- templates/folsom/quantum.conf	2013-08-19 21:13:45 +0000
+++ templates/folsom/quantum.conf	2014-01-31 09:53:01 +0000
@@ -30,7 +30,18 @@
 {% if neutron_security_groups -%}
 allow_overlapping_ips = True
 {% endif -%}
-
+{% if neutron_bind_port -%}
+network_api_class = nova.network.quantumv2.api.API
+quantum_url = {{ quantum_url }}
+quantum_auth_strategy = keystone
+quantum_admin_tenant_name = services
+quantum_admin_username = {{ service_username }}
+quantum_admin_password = {{ service_password }}
+quantum_admin_auth_url = {{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0
+linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver
+firewall_driver = nova.virt.firewall.NoopFirewallDriver
+security_group_api = quantum
+{% endif -%}
 
 [QUOTAS]
 quota_driver = quantum.db.quota_db.DbQuotaDriver

=== modified file 'templates/havana/neutron.conf'
--- templates/havana/neutron.conf	2013-12-12 20:10:37 +0000
+++ templates/havana/neutron.conf	2014-01-31 09:53:01 +0000
@@ -26,6 +26,18 @@
 rabbit_password = {{ rabbitmq_password }}
 rabbit_virtual_host = {{ rabbitmq_virtual_host }}
 {% endif -%}
+{% if neutron_bind_port -%}
+network_api_class = nova.network.neutronv2.api.API
+neutron_url = {{ quantum_url }}
+neutron_auth_strategy = keystone
+neutron_admin_tenant_name = services
+neutron_admin_username = {{ service_username }}
+neutron_admin_password = {{ service_password }}
+neutron_admin_auth_url = {{ service_protocol }}://{{ keystone_host }}:{{ service_port }}/v2.0
+linuxnet_interface_driver = nova.network.linux_net.LinuxOVSInterfaceDriver
+firewall_driver = nova.virt.firewall.NoopFirewallDriver
+security_group_api = neutron
+{% endif -%}
 
 [quotas]
 quota_driver = neutron.db.quota_db.DbQuotaDriver