← Back to branch summary

~corey.bryant/charms/trusty/nova-compute/sync-charm-helpers

« back to all changes in this revision

Viewing changes to templates/havana/nova.conf

  • Committer: James Page
  • Date: 2013-11-17 21:47:29 UTC
  • mfrom: (47.2.12 nova-compute)
  • Revision ID: james.page@canonical.com-20131117214729-g782k2u6bf52c64b
[gandelman-a] Merge of changes for ODS keynotes including NVP support and service restart on db changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/havana/nova.conf
2
2
###############################################################################
3
3
# [ WARNING ]
4
4
# Configuration file maintained by Juju. Local changes may be overwritten.
 
5
{% if restart_trigger -%}
 
6
# restart trigger: {{ restart_trigger }}
 
7
{% endif -%}
5
8
###############################################################################
6
9
[DEFAULT]
7
10
dhcpbridge_flagfile=/etc/nova/nova.conf
52
55
 
53
56
{% if neutron_plugin and neutron_plugin == 'nvp' -%}
54
57
libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtOpenVswitchVirtualPortDriver
 
58
security_group_api = neutron
 
59
firewall_driver = nova.virt.firewall.NoopFirewallDriver
55
60
{% endif -%}
56
61
 
57
62
{% if network_manager_config -%}