[openstack-nova] remove /etc/tgt/conf.d/nova.conf which was invalid for grizzly

[Pádraig Brady]

commit df9b950ff52cf86b160cd19090efd2e601e50354
Author: Pádraig Brady <P at draigBrady.com>
Date:   Wed Mar 20 23:34:58 2013 +0000

    remove /etc/tgt/conf.d/nova.conf which was invalid for grizzly
    
    This referenced an invalid path since the nova-volume package
    was removed in grizzly, thus stopping tgtd from starting.

 nova-tgt.conf       |    1 -
 openstack-nova.spec |    9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/openstack-nova.spec b/openstack-nova.spec
index 9532183..6e00abe 100644
--- a/openstack-nova.spec
+++ b/openstack-nova.spec
@@ -2,7 +2,7 @@
 
 Name:             openstack-nova
 Version:          2013.1
-Release:          0.9.g3%{?dist}
+Release:          0.10.g3%{?dist}
 Summary:          OpenStack Compute (nova)
 
 Group:            Applications/System
@@ -11,7 +11,6 @@ URL:              http://openstack.org/projects/compute/
 Source0:          https://launchpad.net/nova/grizzly/grizzly-3/+download/nova-2013.1.g3.tar.gz
 
 Source1:          nova.conf
-Source3:          nova-tgt.conf
 Source6:          nova.logrotate
 
 Source10:         openstack-nova-api.service
@@ -424,8 +423,6 @@ touch %{buildroot}%{_sharedstatedir}/nova/CA/private/cakey.pem
 # Install config files
 install -d -m 755 %{buildroot}%{_sysconfdir}/nova
 install -p -D -m 640 %{SOURCE1} %{buildroot}%{_sysconfdir}/nova/nova.conf
-install -d -m 755 %{buildroot}%{_sysconfdir}/nova/volumes
-install -p -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/tgt/conf.d/nova.conf
 install -p -D -m 640 etc/nova/rootwrap.conf %{buildroot}%{_sysconfdir}/nova/rootwrap.conf
 install -p -D -m 640 etc/nova/api-paste.ini %{buildroot}%{_sysconfdir}/nova/api-paste.ini
 install -p -D -m 640 etc/nova/policy.json %{buildroot}%{_sysconfdir}/nova/policy.json
@@ -725,7 +722,6 @@ fi
 %{_bindir}/nova-baremetal-manage
 %{_unitdir}/openstack-nova-compute.service
 %{_datarootdir}/nova/rootwrap/compute.filters
-%config(noreplace) %{_sysconfdir}/tgt/conf.d/nova.conf
 
 %files network
 %{_bindir}/nova-network
@@ -794,6 +790,9 @@ fi
 %endif
 
 %changelog
+* Wed Mar 20 2013 Pádraig Brady - 2013.1-0.10.g3
+- Remove /etc/tgt/conf.d/nova.conf which was invalid for grizzly
+
 * Tue Mar 12 2013 Pádraig Brady - 2013.1-0.9.g3
 - Allow openstack-nova-doc to be installed in isolation