Merge lp:~ivoks/charms/precise/nova-cloud-controller/fix-neutron-url into lp:~charmers/charms/precise/nova-cloud-controller/trunk

[Ante Karamatić]

In previous commit, we tried define neutron_url, but used wrong template variables; those for keystone. By removing the neutron_url, we'll use default value (localhost:9696), which is fine since neutron/quantum server is running on the same host.

=== modified file 'templates/folsom/nova.conf'
--- templates/folsom/nova.conf	2014-01-31 16:26:01 +0000
+++ templates/folsom/nova.conf	2014-02-03 13:45:33 +0000
@@ -74,7 +74,6 @@
 {% 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 }}
@@ -84,7 +83,6 @@
 {% 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 }}