From 636fd5d94323e0f4808bcb760ce9c8d67a613701 Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Thu, 13 Feb 2014 13:19:13 +1100 Subject: [PATCH] Remove file injection settings from nova.conf Nova upstream now disables file injection for both baremetal and virtual machines, so we no longer have to ship the configuration change in our nova.conf. Change-Id: Ieeb890aeb1fb7593e11232b95da40dfadae7962a --- elements/nova/os-apply-config/etc/nova/nova.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/elements/nova/os-apply-config/etc/nova/nova.conf b/elements/nova/os-apply-config/etc/nova/nova.conf index 0f4c373d2..bc9722bf1 100644 --- a/elements/nova/os-apply-config/etc/nova/nova.conf +++ b/elements/nova/os-apply-config/etc/nova/nova.conf @@ -138,7 +138,6 @@ driver = nova.virt.baremetal.pxe.PXE pxe_network_config=True pxe_deploy_timeout={{pxe_deploy_timeout}} power_manager = {{power_manager}} -use_file_injection=False {{#virtual_power}} virtual_power_host_user={{user}} virtual_power_host_key={{key}} @@ -168,6 +167,3 @@ admin_url = http://{{keystone.host}}:35357/v2.0 admin_tenant_name = service api_endpoint = http://localhost:6358/v1 {{/ironic}} - -[libvirt] -inject_partition=-2