Merge "Stop using deprecated libvirt_type setting."
This commit is contained in:
commit
a443904f17
@ -91,9 +91,6 @@ rpc_backend=nova.openstack.common.rpc.impl_qpid
|
|||||||
enabled_apis = ec2,osapi_compute,metadata,openstack_compute_api_v2
|
enabled_apis = ec2,osapi_compute,metadata,openstack_compute_api_v2
|
||||||
|
|
||||||
compute_driver = {{nova.compute_driver}}
|
compute_driver = {{nova.compute_driver}}
|
||||||
{{#nova.compute_libvirt_type}}
|
|
||||||
libvirt_type={{nova.compute_libvirt_type}}
|
|
||||||
{{/nova.compute_libvirt_type}}
|
|
||||||
|
|
||||||
|
|
||||||
# nova-compute configuration for ceilometer
|
# nova-compute configuration for ceilometer
|
||||||
@ -167,3 +164,8 @@ admin_url = http://{{keystone.host}}:35357/v2.0
|
|||||||
admin_tenant_name = service
|
admin_tenant_name = service
|
||||||
api_endpoint = http://localhost:6358/v1
|
api_endpoint = http://localhost:6358/v1
|
||||||
{{/ironic}}
|
{{/ironic}}
|
||||||
|
|
||||||
|
[libvirt]
|
||||||
|
{{#nova.compute_libvirt_type}}
|
||||||
|
virt_type={{nova.compute_libvirt_type}}
|
||||||
|
{{/nova.compute_libvirt_type}}
|
||||||
|
Loading…
Reference in New Issue
Block a user