← Back to branch summary

~hopem/charms/trusty/nova-compute/lp1548478

« back to all changes in this revision

Viewing changes to templates/havana/nova.conf

  • Committer: Edward Hope-Morley
  • Date: 2014-06-02 18:37:32 UTC
  • mto: (83.2.1 nova-compute.lp1286762)
  • mto: This revision was merged to the branch mainline in revision 94.
  • Revision ID: edward.hope-morley@canonical.com-20140602183732-wr97ydp8ipo8wrcg
[hopem] added support for libvirt RBD imagebackend

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/havana/nova.conf
35
35
{% endif -%}
36
36
 
37
37
{% if rbd_pool -%}
38
 
rbd_pool = {{ rbd_pool }}
 
38
libvirt_images_rbd_pool = {{ rbd_pool }}
39
39
rbd_user = {{ rbd_user }}
40
40
rbd_secret_uuid = {{ rbd_secret_uuid }}
41
41
{% endif -%}
42
42
 
 
43
{% if libvirt_image_backend -%}
 
44
libvirt_images_type = {{ libvirt_images_type }}
 
45
libvirt_inject_password=false
 
46
libvirt_inject_key=false
 
47
libvirt_inject_partition=-2
 
48
{% endif -%}
 
49
 
43
50
{% if neutron_plugin and neutron_plugin == 'ovs' -%}
44
51
libvirt_vif_driver = nova.virt.libvirt.vif.LibvirtGenericVIFDriver
45
52
{% if neutron_security_groups -%}