openstack
/
tripleo-image-elements
Code Issues Proposed changes

Merge "Stop using deprecated libvirt_type setting."

This commit is contained in:
Jenkins 2014-02-21 00:55:32 +00:00 committed by Gerrit Code Review
parent 63bcf7ee56 2b9091ff2e
commit a443904f17
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
elements/nova/os-apply-config/etc/nova/nova.conf
View File

@ -91,9 +91,6 @@ rpc_backend=nova.openstack.common.rpc.impl_qpid
enabled_apis = ec2,osapi_compute,metadata,openstack_compute_api_v2
compute_driver = {{nova.compute_driver}}
{{#nova.compute_libvirt_type}}
libvirt_type={{nova.compute_libvirt_type}}
{{/nova.compute_libvirt_type}}
# nova-compute configuration for ceilometer
@ -167,3 +164,8 @@ admin_url = http://{{keystone.host}}:35357/v2.0
admin_tenant_name = service
api_endpoint = http://localhost:6358/v1
{{/ironic}}
[libvirt]
{{#nova.compute_libvirt_type}}
virt_type={{nova.compute_libvirt_type}}
{{/nova.compute_libvirt_type}}