Code Review / openstack-build / cinder-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: de6da91)
Fix spec and patch
authorSergey Otpuschennikov <sotpuschennikov@mirantis.com>
Mon, 28 Oct 2013 09:00:03 +0000 (13:00 +0400)
committerSergey Otpuschennikov <sotpuschennikov@mirantis.com>
Mon, 28 Oct 2013 09:00:03 +0000 (13:00 +0400)
Change-Id: I188e25bda6513f79a5512b33596d3aa3c01f91f6

rpm/SOURCES/0004-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch patch | blob | history
rpm/SOURCES/cinder-dist.conf [moved from rpm/SOURCES/cinder.conf with 91% similarity] patch | blob | history
rpm/SOURCES/openstack-cinder-api.init patch | blob | history
rpm/SOURCES/openstack-cinder-api.upstart patch | blob | history
rpm/SOURCES/openstack-cinder-backup.init patch | blob | history
rpm/SOURCES/openstack-cinder-backup.upstart patch | blob | history
rpm/SOURCES/openstack-cinder-scheduler.init patch | blob | history
rpm/SOURCES/openstack-cinder-scheduler.upstart patch | blob | history
rpm/SOURCES/openstack-cinder-volume.init patch | blob | history
rpm/SOURCES/openstack-cinder-volume.upstart patch | blob | history
rpm/SPECS/openstack-cinder.spec patch | blob | history

diff --git a/rpm/SOURCES/0004-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch b/rpm/SOURCES/0004-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
index 362462ac737b8b65a0ac8e59f1206ba67208f81b..f9609a750d8c6cb91444c707cb631b1ebf92652b 100644 (file)
--- a/rpm/SOURCES/0004-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
+++ b/rpm/SOURCES/0004-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
@@ -1230,8 +1230,7 @@ diff --git a/test-requirements.txt b/test-requirements.txt
 index 3d8e9bf..f83b20b 100644
 --- a/test-requirements.txt
 +++ b/test-requirements.txt
-@@ -12,5 +12,4 @@
- sphinx>=1.1.2
+@@ -12,4 +12,3 @@ sphinx>=1.1.2
  python-subunit
  testtools>=0.9.32
  testrepository>=0.0.17
diff --git a/rpm/SOURCES/cinder.conf b/rpm/SOURCES/cinder-dist.conf
similarity index 91%
rename from rpm/SOURCES/cinder.conf
rename to rpm/SOURCES/cinder-dist.conf
index 89105a6b2e613388b9b0fd0ea6961866a654ccb5..ccc7c3f6c13f1cf3c93aa703b80a6e7d6bf233d6 100644 (file)
--- a/rpm/SOURCES/cinder.conf
+++ b/rpm/SOURCES/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/rpm/SOURCES/openstack-cinder-api.init b/rpm/SOURCES/openstack-cinder-api.init
index 01045ebea9fa9ed38d1cf6c16f435558cb3405d0..1fb46a7b6b73829fc4925667ea16f781a11fe402 100644 (file)
--- a/rpm/SOURCES/openstack-cinder-api.init
+++ b/rpm/SOURCES/openstack-cinder-api.init
@@ -28,6 +28,7 @@ suffix=api
 prog=openstack-cinder-$suffix
 exec="/usr/bin/cinder-$suffix"
 config="/etc/cinder/cinder.conf"
+distconfig="/usr/share/cinder/cinder-dist.conf"
 pidfile="/var/run/cinder/cinder-$suffix.pid"
 logfile="/var/log/cinder/$suffix.log"
 
@@ -39,7 +40,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user cinder --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user cinder --pidfile $pidfile "$exec --config-file $distconfig --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/rpm/SOURCES/openstack-cinder-api.upstart b/rpm/SOURCES/openstack-cinder-api.upstart
index f3111f28e92f1bde414cb27ef04daea9bac3ccbd..51acbc58dc9c98e8d31e3d2a0e79e3db3e583149 100644 (file)
--- a/rpm/SOURCES/openstack-cinder-api.upstart
+++ b/rpm/SOURCES/openstack-cinder-api.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/cinder-api --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/api.log" cinder
+exec su -s /bin/sh -c "exec /usr/bin/cinder-api --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/api.log" cinder
diff --git a/rpm/SOURCES/openstack-cinder-backup.init b/rpm/SOURCES/openstack-cinder-backup.init
index 2e9593a00f0106afdb103e071446ee7f701be668..ce999f6412babbfc8237e608a2147263148f5e0c 100644 (file)
--- a/rpm/SOURCES/openstack-cinder-backup.init
+++ b/rpm/SOURCES/openstack-cinder-backup.init
@@ -22,6 +22,7 @@ suffix=backup
 prog=openstack-cinder-$suffix
 exec="/usr/bin/cinder-$suffix"
 config="/etc/cinder/cinder.conf"
+distconfig="/usr/share/cinder/cinder-dist.conf"
 pidfile="/var/run/cinder/cinder-$suffix.pid"
 logfile="/var/log/cinder/$suffix.log"
 
@@ -33,7 +34,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user cinder --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user cinder --pidfile $pidfile "$exec --config-file $distconfig --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/rpm/SOURCES/openstack-cinder-backup.upstart b/rpm/SOURCES/openstack-cinder-backup.upstart
index a90cb673cd055195aa5daecf357ee77d545f7880..1c23c21787a810167f8ac203d8c1505f6fe92e77 100644 (file)
--- a/rpm/SOURCES/openstack-cinder-backup.upstart
+++ b/rpm/SOURCES/openstack-cinder-backup.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/cinder-backup --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/backup.log" cinder
+exec su -s /bin/sh -c "exec /usr/bin/cinder-backup --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/backup.log" cinder
diff --git a/rpm/SOURCES/openstack-cinder-scheduler.init b/rpm/SOURCES/openstack-cinder-scheduler.init
index 637a0bbd37f048d03338c8d9253462315203c0da..8d1ba8febb944b5b5003071fd6dc6799bf0f6261 100644 (file)
--- a/rpm/SOURCES/openstack-cinder-scheduler.init
+++ b/rpm/SOURCES/openstack-cinder-scheduler.init
@@ -20,6 +20,7 @@ suffix=scheduler
 prog=openstack-cinder-$suffix
 exec="/usr/bin/cinder-$suffix"
 config="/etc/cinder/cinder.conf"
+distconfig="/usr/share/cinder/cinder-dist.conf"
 pidfile="/var/run/cinder/cinder-$suffix.pid"
 logfile="/var/log/cinder/$suffix.log"
 
@@ -31,7 +32,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user cinder --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user cinder --pidfile $pidfile "$exec --config-file $distconfig --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/rpm/SOURCES/openstack-cinder-scheduler.upstart b/rpm/SOURCES/openstack-cinder-scheduler.upstart
index aef16c5cf068b4328fc1eb1e77cd5c31a10cb734..b152c1846ad57d1ade840bc00d6feb3c340b3136 100644 (file)
--- a/rpm/SOURCES/openstack-cinder-scheduler.upstart
+++ b/rpm/SOURCES/openstack-cinder-scheduler.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/cinder-scheduler --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/scheduler.log" cinder
+exec su -s /bin/sh -c "exec /usr/bin/cinder-scheduler --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/scheduler.log" cinder
diff --git a/rpm/SOURCES/openstack-cinder-volume.init b/rpm/SOURCES/openstack-cinder-volume.init
index 1ca1a8e902fa8ab98d6f90f8b1cba31a12f989e8..896c6b3983b6bf1a522045c3f0174684a049ef95 100644 (file)
--- a/rpm/SOURCES/openstack-cinder-volume.init
+++ b/rpm/SOURCES/openstack-cinder-volume.init
@@ -28,6 +28,7 @@ suffix=volume
 prog=openstack-cinder-$suffix
 exec="/usr/bin/cinder-$suffix"
 config="/etc/cinder/cinder.conf"
+distconfig="/usr/share/cinder/cinder-dist.conf"
 pidfile="/var/run/cinder/cinder-$suffix.pid"
 logfile="/var/log/cinder/$suffix.log"
 
@@ -39,7 +40,7 @@ start() {
     [ -x $exec ] || exit 5
     [ -f $config ] || exit 6
     echo -n $"Starting $prog: "
-    daemon --user cinder --pidfile $pidfile "$exec --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
+    daemon --user cinder --pidfile $pidfile "$exec --config-file $distconfig --config-file $config --logfile $logfile &>/dev/null & echo \$! > $pidfile"
     retval=$?
     echo
     [ $retval -eq 0 ] && touch $lockfile
diff --git a/rpm/SOURCES/openstack-cinder-volume.upstart b/rpm/SOURCES/openstack-cinder-volume.upstart
index 85730c9effb459521958b2c1ccf59be60e899b3c..46020f48bd01f046208d0df16efa0b91503fe834 100644 (file)
--- a/rpm/SOURCES/openstack-cinder-volume.upstart
+++ b/rpm/SOURCES/openstack-cinder-volume.upstart
@@ -5,4 +5,4 @@ stop on runlevel [S016]
 
 respawn
 
-exec su -s /bin/sh -c "exec /usr/bin/cinder-volume --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/volume.log" cinder
+exec su -s /bin/sh -c "exec /usr/bin/cinder-volume --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf --logfile /var/log/cinder/volume.log" cinder
diff --git a/rpm/SPECS/openstack-cinder.spec b/rpm/SPECS/openstack-cinder.spec
index 7bcec366372be686e0e8a763741b86b94beb7485..14954f2f138f496f6eecd9c40806f5a64d1e8c34 100644 (file)
--- a/rpm/SPECS/openstack-cinder.spec
+++ b/rpm/SPECS/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
 
@@ -103,7 +103,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
@@ -204,7 +204,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
@@ -285,8 +286,9 @@ 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(0750, cinder, root) %{_localstatedir}/log/cinder
 %dir %attr(0755, cinder, root) %{_localstatedir}/run/cinder
 %dir %attr(0755, cinder, root) %{_sysconfdir}/cinder/volumes
 
@@ -310,6 +312,10 @@ fi
 %endif
 
 %changelog
+* Wed Sep 18 2013 Eric Harney <eharney@redhat.com> - 2013.2-0.9.b3
+- Add cinder-dist.conf
+- Tighten permissions on /var/log/cinder
+
 * Mon Sep 9 2013 Eric Harney <eharney@redhat.com> - 2013.2-0.8.b3
 - Update to Havana milestone 3
 - Add dependency on python-novaclient