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

[Ante Karamatić]

Add support for quantum/neutron for novaclient.

[lp:~ivoks/charms/precise/nova-cloud-controller/ncc-neutronclient]

64. By Ante Karamatić on 2014-02-03

Readd removed line in a template

=== modified file 'templates/folsom/nova.conf'
--- templates/folsom/nova.conf	2013-10-28 19:03:14 +0000
+++ templates/folsom/nova.conf	2014-02-03 07:26:58 +0000
@@ -73,8 +73,24 @@
 
 {% if network_manager and network_manager == 'quantum' -%}
 network_api_class = nova.network.quantumv2.api.API
+{% if auth_host -%}
+quantum_url = {{ service_protocol }}://{{ service_host }}:{{ service_port }}
+quantum_auth_strategy = keystone
+quantum_admin_tenant_name = {{ admin_tenant_name }}
+quantum_admin_username = {{ admin_user }}
+quantum_admin_password = {{ admin_password }}
+quantum_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
+{% endif -%}
 {% elif network_manager and network_manager == 'neutron' -%}
 network_api_class = nova.network.neutronv2.api.API
+{% if auth_host -%}
+neutron_url = {{ service_protocol }}://{{ service_host }}:{{ service_port }}
+neutron_auth_strategy = keystone
+neutron_admin_tenant_name = {{ admin_tenant_name }}
+neutron_admin_username = {{ admin_user }}
+neutron_admin_password = {{ admin_password }}
+neutron_admin_auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}/v2.0
+{% endif -%}
 {% else -%}
 network_manager = nova.network.manager.FlatDHCPManager
 {% endif -%}