Merge "Remove file injection settings from nova.conf"

This commit is contained in:
Jenkins 2014-02-13 16:36:38 +00:00 committed by Gerrit Code Review
commit e77bb14ba7

View File

@ -138,7 +138,6 @@ driver = nova.virt.baremetal.pxe.PXE
pxe_network_config=True pxe_network_config=True
pxe_deploy_timeout={{pxe_deploy_timeout}} pxe_deploy_timeout={{pxe_deploy_timeout}}
power_manager = {{power_manager}} power_manager = {{power_manager}}
use_file_injection=False
{{#virtual_power}} {{#virtual_power}}
virtual_power_host_user={{user}} virtual_power_host_user={{user}}
virtual_power_host_key={{key}} virtual_power_host_key={{key}}
@ -168,6 +167,3 @@ 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]
inject_partition=-2