[openstack-nova] remove folsom config vars from nova-dist.conf

[Nikola Dipanov]

commit c8c31dbb3ba514d4aad9b9345748136881dcb36c
Author: Xavier Queralt <xqueralt at redhat.com>
Date:   Thu Aug 8 14:51:48 2013 +0200

    remove folsom config vars from nova-dist.conf

 nova-dist.conf      |    2 --
 openstack-nova.spec |    5 ++++-
 2 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/nova-dist.conf b/nova-dist.conf
index b1cdfe6..7403f7e 100644
--- a/nova-dist.conf
+++ b/nova-dist.conf
@@ -2,7 +2,6 @@
 logdir = /var/log/nova
 state_path = /var/lib/nova
 lock_path = /var/lib/nova/tmp
-volumes_dir = /etc/nova/volumes
 dhcpbridge = /usr/bin/nova-dhcpbridge
 dhcpbridge_flagfile = /usr/share/nova/nova-dist.conf
 dhcpbridge_flagfile = /etc/nova/nova.conf
@@ -11,7 +10,6 @@ injected_network_template = /usr/share/nova/interfaces.template
 libvirt_nonblocking = True
 libvirt_inject_partition = -1
 network_manager = nova.network.manager.FlatDHCPManager
-iscsi_helper = tgtadm
 sql_connection = mysql://nova:nova@localhost/nova
 sql_max_retries = -1
 compute_driver = libvirt.LibvirtDriver
diff --git a/openstack-nova.spec b/openstack-nova.spec
index e2e0089..1ae00bd 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,7 +2,7 @@
 
 Name:             openstack-nova
 Version:          2013.2
-Release:          0.12.b2%{?dist}
+Release:          0.13.b2%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
@@ -897,6 +897,9 @@ fi
 %endif
 
 %changelog
+* Tue Aug 27 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-0.13.b2
+- Remove Folsom release deprecated config options from nova-dist.conf
+
 * Tue Aug 27 2013 Xavier Queralt <xqueralt at redhat.com> - 2013.2-0.12.b2
 - Add the second dhcpbridge-flagfile to nova-dist.conf