[openstack-cinder] Add cinder-dist.conf

[Eric Harney]

commit a0abd60ed200ecb025da03c61280e9718a0dc2eb
Author: Eric Harney <eharney at redhat.com>
Date:   Thu Sep 19 17:47:05 2013 -0400

    Add cinder-dist.conf

 cinder.conf => cinder-dist.conf    |    2 +-
 openstack-cinder-api.service       |    2 +-
 openstack-cinder-backup.service    |    2 +-
 openstack-cinder-scheduler.service |    2 +-
 openstack-cinder-volume.service    |    2 +-
 openstack-cinder.spec              |   13 +++++++++----
 6 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/cinder.conf b/cinder-dist.conf
similarity index 91%
rename from cinder.conf
rename to cinder-dist.conf
index 89105a6..ccc7c3f 100644
--- a/cinder.conf
+++ b/cinder-dist.conf
@@ -7,6 +7,7 @@ iscsi_helper = tgtadm
 sql_connection = mysql://cinder:cinder@localhost/cinder
 rpc_backend = cinder.openstack.common.rpc.impl_qpid
 rootwrap_config = /etc/cinder/rootwrap.conf
+auth_strategy = keystone
 
 [keystone_authtoken]
 admin_tenant_name = %SERVICE_TENANT_NAME%
@@ -15,4 +16,3 @@ admin_password = %SERVICE_PASSWORD%
 auth_host = 127.0.0.1
 auth_port = 35357
 auth_protocol = http
-signing_dirname = /tmp/keystone-signing-cinder
diff --git a/openstack-cinder-api.service b/openstack-cinder-api.service
index 0412bc2..e9ca405 100644
--- a/openstack-cinder-api.service
+++ b/openstack-cinder-api.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
 [Service]
 Type=simple
 User=cinder
-ExecStart=/usr/bin/cinder-api --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/api.log
+ExecStart=/usr/bin/cinder-api --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/api.log
 
 [Install]
 WantedBy=multi-user.target
diff --git a/openstack-cinder-backup.service b/openstack-cinder-backup.service
index d113010..e1b2548 100644
--- a/openstack-cinder-backup.service
+++ b/openstack-cinder-backup.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
 [Service]
 Type=simple
 User=cinder
-ExecStart=/usr/bin/cinder-backup --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/backup.log
+ExecStart=/usr/bin/cinder-backup --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/backup.log
 
 [Install]
 WantedBy=multi-user.target
diff --git a/openstack-cinder-scheduler.service b/openstack-cinder-scheduler.service
index 32a69e7..e791662 100644
--- a/openstack-cinder-scheduler.service
+++ b/openstack-cinder-scheduler.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
 [Service]
 Type=simple
 User=cinder
-ExecStart=/usr/bin/cinder-scheduler --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/scheduler.log
+ExecStart=/usr/bin/cinder-scheduler --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/scheduler.log
 
 [Install]
 WantedBy=multi-user.target
diff --git a/openstack-cinder-volume.service b/openstack-cinder-volume.service
index a1a9712..00ae156 100644
--- a/openstack-cinder-volume.service
+++ b/openstack-cinder-volume.service
@@ -5,7 +5,7 @@ After=syslog.target network.target
 [Service]
 Type=simple
 User=cinder
-ExecStart=/usr/bin/cinder-volume --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/volume.log
+ExecStart=/usr/bin/cinder-volume --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/volume.log
 
 [Install]
 WantedBy=multi-user.target
diff --git a/openstack-cinder.spec b/openstack-cinder.spec
index 63fcad8..85503d8 100644
--- a/openstack-cinder.spec
+++ b/openstack-cinder.spec
@@ -2,14 +2,14 @@
 
 Name:             openstack-cinder
 Version:          2013.2
-Release:          0.8.b3%{?dist}
+Release:          0.9.b3%{?dist}
 Summary:          OpenStack Volume service
 
 Group:            Applications/System
 License:          ASL 2.0
 URL:              http://www.openstack.org/software/openstack-storage/
 Source0:          https://launchpad.net/cinder/havana/havana-3/+download/cinder-%{version}.b3.tar.gz
-Source1:          cinder.conf
+Source1:          cinder-dist.conf
 Source2:          cinder.logrotate
 Source3:          cinder-tgt.conf
 
@@ -94,7 +94,7 @@ Requires:         python-swiftclient >= 1.2
 Requires:         python-keystoneclient
 Requires:         python-novaclient >= 2.14
 
-Requires:         python-oslo-config
+Requires:         python-oslo-config >= 1:1.2.0
 Requires:         python-six
 
 Requires:         python-babel
@@ -195,7 +195,8 @@ install -d -m 755 %{buildroot}%{_localstatedir}/log/cinder
 
 # Install config files
 install -d -m 755 %{buildroot}%{_sysconfdir}/cinder
-install -p -D -m 640 %{SOURCE1} %{buildroot}%{_sysconfdir}/cinder/cinder.conf
+install -p -D -m 640 %{SOURCE1} %{buildroot}%{_datadir}/cinder/cinder-dist.conf
+install -p -D -m 640 etc/cinder/cinder.conf.sample %{buildroot}%{_sysconfdir}/cinder/cinder.conf
 install -d -m 755 %{buildroot}%{_sysconfdir}/cinder/volumes
 install -p -D -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/tgt/conf.d/cinder.conf
 install -p -D -m 640 etc/cinder/rootwrap.conf %{buildroot}%{_sysconfdir}/cinder/rootwrap.conf
@@ -268,6 +269,7 @@ fi
 %config(noreplace) %{_sysconfdir}/logrotate.d/openstack-cinder
 %config(noreplace) %{_sysconfdir}/sudoers.d/cinder
 %config(noreplace) %{_sysconfdir}/tgt/conf.d/cinder.conf
+%attr(-, root, cinder) %{_datadir}/cinder/cinder-dist.conf
 
 %dir %attr(0755, cinder, root) %{_localstatedir}/log/cinder
 %dir %attr(0755, cinder, root) %{_localstatedir}/run/cinder
@@ -293,6 +295,9 @@ fi
 %endif
 
 %changelog
+* Wed Sep 18 2013 Eric Harney <eharney at redhat.com> - 2013.2-0.9.b3
+- Add cinder-dist.conf
+
 * Mon Sep 9 2013 Eric Harney <eharney at redhat.com> - 2013.2-0.8.b3
 - Update to Havana milestone 3
 - Add dependency on python-novaclient