From fef67def2225f42e0f713249510da0c23490d4ff Mon Sep 17 00:00:00 2001 From: Jorge Niedbalski R Date: Fri, 18 Apr 2014 15:36:09 -0400 Subject: [PATCH] Removed unused options according to lp:1300142 iscsi_helper this is moved to cinder in Grizzly. can be removed connection_type this is deprecated in Folsom and removed in Grizzly. can be removed root_helper this is deprecated in Folsom and removed in Grizzly. can be removed volumes_path not sure when it deprecated, but removed before Grizzly. --- templates/grizzly/nova.conf | 4 ---- templates/havana/nova.conf | 4 ---- 2 files changed, 8 deletions(-) diff --git a/templates/grizzly/nova.conf b/templates/grizzly/nova.conf index a03444b7..bec7a7b3 100644 --- a/templates/grizzly/nova.conf +++ b/templates/grizzly/nova.conf @@ -13,15 +13,11 @@ logdir=/var/log/nova state_path=/var/lib/nova lock_path=/var/lock/nova force_dhcp_release=True -iscsi_helper=tgtadm libvirt_use_virtio_for_bridges=True -connection_type=libvirt -root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf verbose=True use_syslog = {{ use_syslog }} ec2_private_dns_show_ip=True api_paste_config=/etc/nova/api-paste.ini -volumes_path=/var/lib/nova/volumes enabled_apis=ec2,osapi_compute,metadata auth_strategy=keystone compute_driver=libvirt.LibvirtDriver diff --git a/templates/havana/nova.conf b/templates/havana/nova.conf index 108c07c9..7fe89868 100644 --- a/templates/havana/nova.conf +++ b/templates/havana/nova.conf @@ -13,15 +13,11 @@ logdir=/var/log/nova state_path=/var/lib/nova lock_path=/var/lock/nova force_dhcp_release=True -iscsi_helper=tgtadm libvirt_use_virtio_for_bridges=True -connection_type=libvirt -root_helper=sudo nova-rootwrap /etc/nova/rootwrap.conf verbose=True use_syslog = {{ use_syslog }} ec2_private_dns_show_ip=True api_paste_config=/etc/nova/api-paste.ini -volumes_path=/var/lib/nova/volumes enabled_apis=ec2,osapi_compute,metadata auth_strategy=keystone compute_driver=libvirt.LibvirtDriver