← Back to branch summary

~hopem/charms/precise/nova-cloud-controller/lp1273469

« back to all changes in this revision

Viewing changes to templates/folsom/nova.conf

  • Committer: James Page
  • Date: 2014-02-19 11:02:03 UTC
  • mfrom: (62.1.6 tls-ha)
  • Revision ID: james.page@canonical.com-20140219110203-5z78s29rp3cl55vq
[ivoks] Re-order port-pipeline to ensure end-to-end SSL

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/folsom/nova.conf
73
73
 
74
74
{% if network_manager and network_manager == 'quantum' -%}
75
75
network_api_class = nova.network.quantumv2.api.API
 
76
quantum_url = {{ neutron_url }}
76
77
{% if auth_host -%}
77
78
quantum_auth_strategy = keystone
78
79
quantum_admin_tenant_name = {{ admin_tenant_name }}
82
83
{% endif -%}
83
84
{% elif network_manager and network_manager == 'neutron' -%}
84
85
network_api_class = nova.network.neutronv2.api.API
 
86
neutron_url = {{ neutron_url }}
85
87
{% if auth_host -%}
86
88
neutron_auth_strategy = keystone
87
89
neutron_admin_tenant_name = {{ admin_tenant_name }}