Hello community,
here is the log from the commit of package openstack-cinder for
openSUSE:Factory checked in at 2013-04-29 14:08:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openstack-cinder (Old)
and /work/SRC/openSUSE:Factory/.openstack-cinder.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-cinder", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/openstack-cinder/openstack-cinder-doc.changes
2013-01-17 09:51:17.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.openstack-cinder.new/openstack-cinder-doc.changes
2013-04-29 14:08:52.000000000 +0200
@@ -1,0 +2,184 @@
+Tue Feb 26 11:21:48 UTC 2013 - [email protected]
+
+- add python-oslo-config buildrequires
+
+-------------------------------------------------------------------
+Fri Feb 22 11:23:00 UTC 2013 - [email protected]
+
+- BuildRequire openstack-suse-macros instead of openstack-macros
+
+-------------------------------------------------------------------
+Tue Jan 15 15:36:50 UTC 2013 - [email protected]
+
+- Revert "fix", it's sufficient to require python-cinder
+
+--------------------------------------------------------------------
+Tue Jan 15 14:08:28 UTC 2013 - [email protected]
+
+- Update to version 2013.1+git.1358255308.7905b6b:
+ + Factor out LVM code.
+
+--------------------------------------------------------------------
+Mon Jan 14 12:01:00 UTC 2013 - [email protected]
+
+- Update to version 2013.1+git.1358161260.643f916:
+ + Implement filter scheduler
+ + Revert "Implement filter scheduler"
+ + Provide HP 3PAR array iSCSI driver
+ + Fix CinderClient exception name in EMCISCSIDriver.
+ + Enable cinder exception format checking in tests.
+ + Update exceptions to pass correct kwargs.
+ + Add option to make exception format errors fatal.
+ + Implement filter scheduler
+ + Use tempdir for lock_path in tests.
+ + Make WebOb version specification more flexible
+ + Fix cmds clearing in TargetAdminTestCase.
+ + Add missing library
+ + use deleted = False, not 0 for update
+ + Implement ability to Clone volumes in Cinder.
+ + Add pyflakes
+ + Adds synchronization to attach volume.
+ + Add EMC Volume Driver in Cinder
+ + Adding marker, pagination, sort key and sort direction to v2 api
+ + Fix typo in image_utils tempfile handling
+ + Make the NetAppISCSIDriver._is_clone_done() method able to handle
+ + Make sure we don't double remove tmp on exception
+ + Add service mgmt extension.
+ + Added the lockutils, fileutils, gettextutils
+ + Fixes a Windows volume driver bug on disk export
+ + Moving host admin extension with other extensions
+ + Allow the lvm backed drivers to use mirrrors
+ + CHAP support for IBM Storwize/SVC driver.
+ + Remove instance quota re-sync code
+ + Add image metadata API extension
+ + Raise NotImplemented for drivers that don't support images
+ + Add *.swp to gitignore.
+ + Support glance servers over https
+ + Add commands used by NFS volume driver to rootwrap
+ + Changing display_name to name in v2 api
+ + Make summary and detail view consistent with other projects
+ + creating separate v1 and v2 stubs and general fakes
+ + Make copy_to_volume a bit more useful.
+ + Delete type call in api needs update to use ID.
+ + Convert volume_type id from int to uuid.
+ + Rename Config osapi_compute_link_prefix to osapi_volume_base_URL
+ + Fix exception when size is None.
+ + Ensure request_spec can be serialized.
+ + attaching volumes will set instance_uuid instantly
+ + Revert changes to monkey_patch.
+ + Improve provider_location cleanup code for RBD.
+ + Fix import order to make it alphabetical.
+ + Fix None being passed into as_int().
+ + Use auth_token middleware from keystoneclient.
+ + Provide i18n to those messages without _()
+ + Revert "use O_DIRECT when copying from /dev/zero too"
+ + Make pep8 checks a bit stricter.
+ + Unpin lxml requirements
+ + use O_DIRECT when copying from /dev/zero too
+ + Add CONTRIBUTING file.
+ + Add the persistency to the volume created by iscsi IET.
+ + adding copy of v1 as v2
+ + Moving contrib to cinder.api
+ + Moving api v1 implementation into v1 directory
+ + Switching api to use base extension manager
+ + moving all middleware code in cinder.api.middleware
+ + Moving common api code into cinder.api
+ + Cleaning up volume driver paths
+ + Add volume bootable information to api response
+ + Add XenAPINFSDriver
+ + Add db table for Glance Metadata
+ + Remove redundant db.volume_update() in volume manager create_volume()
+ + Pin pep8 1.3.3
+ + Removes the xensm driver
+ + Pass in correct volume_ref to create_from_snapshot.
+ + Add hosts extension to Cinder.
+ + Remove unused python-daemon dependency
+ + Make tox.ini run pep8/hacking checks on bin.
+ + Various pep8/HACKING fixes for Cinder.
+ + Volume RPC API Versioning
+ + Remove gen_uuid()
+ + Remove obsolete use_local_volumes
+ + Import order cleanup per HACKING
+ + Remove unused volume API method - remove_from_compute()
+ + Scheduler API clean up and refactor
+ + Remove dm_setup(remove) call in volume_delete.
+ + Add ability to disable secure volume delete.
+ + Remove the zeroing out of the volume altogether
+ + Add 'create_volume' to scheduler RPC API.
+ + Fix run_tests.sh ambiguous usage msg and behaviour for -x option
+ + Add admin only action for force detach
+ + Changes bit mode of zadara.py to 644
+ + Port openstack-common/uuidutils to Cinder
+ + Fix 401 from auth_token middleware
+ + Splitting out volume drivers in driver.py
+ + Minor optimization in create_volume in HpSanISCSIDriver
+ + Adding a SSH Connection Pool.
+ + Return volume type name on volume create
+ + pin sqlalchemy to the 0.7 series
+ + Add VolumeTenantAttribute API extension
+ + Log the body of an /action
+ + Detect and fix issues caused by vol ID migration
+ + Split out drivers in san.py
+ + Add VolumeHostAttribute API extension
+ + Add default volume type flag
+ + Fix typo so setting volume_tmp_dir works
+ + Rollback for resources during volume creation failure
+ + Allow the user to update a volume's metadata
+ + Add the generation of the username and password for iSCSI target.
+ + Update HACKING.rst and related changes from Nova/PEP8.
+ + Add trove classifiers for PyPI
+ + Ensure device node exists before wiping during volume deletion
+ + Update volume and snapshot status on delete
+ + Drop unused quota_usage db methods
+ + Drop duplicate sqlalchemy db api methods
+ + Change output strings to i18ned
+ + Adds support for Windows 2012 Storage Server
+ + Update common.
+ + Fix incorrect class path for legacycinder formatter in logging_sample.conf
+ + Error message references incorrect variable
+ + Loosen anyjson dependency to avoid clash with ceilometer
+ + Configuration Options clean up
+ + Fix typo in policy documentation
+ + Add snapshot force delete admin action
+ + Mock out sleep in some retry tests
+ + Use policy based rule to define context.is_admin
+ + Sync openstack common and add policy
+ + Fix typo in sample configuration file
+ + Update distribute version in test requires.
+ + Revert explicit usage of tgt-adm --conf option.
+ + Fixes remove_export for IetAdm
+ + Add missing entries in setup, fix up pip-requires
+ + Fix NetAppCmodeISCSIDriver._get_lun_handle() method
+ + Remove unused code: check_for_export.
+ + Return 400 if create volume snapshot force parameter is invalid
+ + Fix cinder-volume-usage-audit
+ + Sync with nova change I135ed85a.
+ + Remove cinder gating hack
+ + Set the default availability zone back to nova
+ + Add lun number (0) to model_update in HpSanDriver
+ + Fixes to the SolarisISCSI Driver
+ + Stop double logging to the console
+ + Restore SIGPIPE default action for subprocesses
+ + Replace builtin hash with MD5 to solve 32/64-bit issues.
+ + Correct IetAdm remove_iscsi_target
+ + Add nova migrate_version check to cinder import
+ + Bump version to 2013.1
+ + Clean up db.volume_create()
+ + Fix volume deletion when device mapper is used
+ + Update quota when deleting volume that failed to be scheduled
+ + Sync a change to rpc from openstack-common.
+ + Add a resume delete on volume manager startup
+ + Improve entity validation in volumes APIs
+ + Add entity body validation helper
+ + Should've added super().tearDown() in test_iscsi
+ + Fixes bug 1050135.
+ + Fix FLAGS.volumes_dir help message
+ + Use tmpdir and avoid leaving test files behind
+ + Sync log format changes from openstack-common.
+ + Update rpc from openstack-common.
+ + Add volume quota in volume/api.py and olume/manager.py
+ + Fixes bug 1049446.
+ + Revert "Don't zero out snapshot volume on snapshot_delete"
+ + Add update to volume and snapshot controllers
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/openstack-cinder/openstack-cinder.changes
2013-04-17 23:12:49.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.openstack-cinder.new/openstack-cinder.changes
2013-04-29 14:08:52.000000000 +0200
@@ -2 +2 @@
-Mon Mar 25 13:24:38 UTC 2013 - [email protected]
+Mon Apr 1 20:57:24 UTC 2013 - [email protected]
@@ -4,3 +4,8 @@
-- add enable-nosetests.diff:
- + Run the monkeypatch to be able to use nosetests directly
- (backport of https://review.openstack.org/#/c/21685/)
+- add sqlalchemy-update.diff:
+ + allow compatibility with SQLAlchemy 0.7.x
+
+-------------------------------------------------------------------
+Wed Mar 27 13:58:14 UTC 2013 - [email protected]
+
+- update to 2013.1.rc3:
+ + rtslib is dropped again
@@ -9 +14 @@
-Sun Mar 24 00:04:28 UTC 2013 - [email protected]
+Tue Mar 26 12:30:37 UTC 2013 - [email protected]
@@ -11,2 +16,2 @@
-- Update to version 2012.2.4+git.1364083468.db0595a:
- + Backport paramiko 1.8.0 requirement to Folsom.
+- Downgrade to version 2013.1.rc2:
+ + Revert from yesterday
@@ -15 +20 @@
-Wed Mar 13 00:16:16 UTC 2013 - [email protected]
+Mon Mar 25 09:37:25 UTC 2013 - [email protected]
@@ -17,3 +22,29 @@
-- Update to version 2012.2.4+git.1363133776.ebcd4b7:
- + Raise NotImplementedError for NFS snapshot operations
- + Only use iscsi_helper config option if using ISCSIDriver
+- Update to version 2013.2.a60.gd6935af:
+ + Clean up exec_dirs prefix from rootwrap conf
+ + Implement get_volume_stats in NFS driver
+ + Remove AGPL rtslib pkg from pip-requires.
+ + CoraidDriver: retrive volume info (improvement)
+ + Remove references to FLAGS from volume/manager.py
+ + Pull Oslo log fix to enable root logger initialization
+ + remove cinder-rtstool because of rtslib dep
+ + Allow snapshot_delete for NFS/GlusterFS drivers
+ + Fix Storwize/SVC LUN allocation with holes.
+ + Use OpenStack common project requires.
+ + Rename cinder-rtstool to rtstool
+ + Add snapshots to the volume usage audit report
+ + Speedup solidfire unit tests
+ + Add missing processutils for impl_zmq in oslo rpc
+ + Update Cinder's latest copy of OSLO grizzly stable
+ + Remove the log spam generated by the NetApp driver unit tests.
+ + Switch all uses of 422 response code to 400.
+ + Updates to OSAPI sizelimit middleware.
+ + Extend param2id() to work with uuids
+ + CoraidDriver: do not call login from __init__
+ + CoraidDriver: typo in _login exception handler
+ + Fetch volume_types by uuid and not by name in v2
+ + Snapshot reservation sync calls wrong resource.
+ + Fixed attach volume for EMC SMI-S iSCSI driver
+ + Last driver sync for Folsom and Grizzly
+ + Fixes Cinder REST API /volumes issue
+ + CoraidDriver: support users that are not admin
+ + Fixed shared gigabytes quota resource.
@@ -22 +53 @@
-Thu Mar 7 08:29:01 UTC 2013 - [email protected]
+Wed Mar 20 23:47:18 UTC 2013 - [email protected]
@@ -24,4 +55,2 @@
-- Update cinder-config-update.diff: update etc/cinder/api-paste.ini
- to have a signing_dir key under [filter:authtoken]. Otherwise,
- cinder-api won't start. This was done with commit de289a6 in
- Grizzly.
+- the policy.json file link in tests was actually correct. remove
+ hack
@@ -30 +59 @@
-Tue Mar 5 16:53:34 UTC 2013 - [email protected]
+Mon Mar 18 09:30:36 UTC 2013 - [email protected]
@@ -32,3 +61,24 @@
-- Update to version 2012.2.4+git.1362502414.95a620b:
- + Check for non-default volume name template.
- + Fix error for extra specs update with empty body.
+- Update to version 2013.2.a7.g4c5f276:
+ + Fix typo in persona valid values
+ + Use self.configuration to support the multi-backend case
+ + Fixes dettach volumes in Windows cinder plugin
+- Drop +git.$TIMESTAMP.$COMMITHASH version suffix
+
+--------------------------------------------------------------------
+Sun Mar 17 00:03:47 UTC 2013 - [email protected]
+
+- Update to version 2013.2.a95.g65e86b0+git.1363478627.65e86b0:
+ + Fix bugs for Huawei driver
+ + cinder-manage does not print any version information
+ + Count Snapshots towards volume/gigabyte quotas.
+ + Fix 3PAR driver hiding existing host error
+ + Fix ISCSIDriver rescan.
+ + Compression/tier capabilities for Storwize/SVC.
+ + Switch to final 1.1.0 oslo.config release
+ + Fix _migrate_up in test_migrations
+ + Bump version for Grizzly RC1 cut
+
+-------------------------------------------------------------------
+Wed Mar 13 10:30:42 UTC 2013 - [email protected]
+
+- run migrations before starting the daemon
@@ -37 +87 @@
-Fri Feb 22 10:08:07 UTC 2013 - [email protected]
+Wed Mar 13 00:05:05 UTC 2013 - [email protected]
@@ -39,2 +89,5 @@
-- Update to version 2012.2.4+git.1361527687.68de70d:
- + Add a safe_minidom_parse_string function. (CVE-2013-1664)
+- Update to version 2013.1.a79.g3f888b9+git.1363133105.3f888b9:
+ + update error log arguements in filter scheduler
+ + Storwize/SVC driver fix for multibackend scenario.
+ + Fix bad request response code on extra_specs create.
+ + Adds a flag to set glance api version to call
@@ -43 +96 @@
-Thu Feb 7 18:29:05 UTC 2013 - [email protected]
+Tue Mar 12 10:53:47 UTC 2013 - [email protected]
@@ -45,3 +98 @@
-- Set auth_strategy to keystone for a good out-of-the-box experience
-- Add cinder-config-update.diff: move configuration changes to a
- patch, instead of using sed.
+- python-oslo-config -> python-oslo.cofnig
@@ -50 +101,41 @@
-Wed Feb 6 06:55:55 UTC 2013 - [email protected]
+Tue Mar 12 00:12:26 UTC 2013 - [email protected]
+
+- Update to version 2013.1.a72.g59a16a1+git.1363047146.59a16a1:
+ + Do not use prefix to lookup host in Storwize/SVC.
+
+-------------------------------------------------------------------
+Mon Mar 11 16:06:12 UTC 2013 - [email protected]
+
+- add sqlalchemy-update.diff:
+ * Support SQLAlchemy 0.7.10
+
+--------------------------------------------------------------------
+Mon Mar 11 12:59:59 UTC 2013 - [email protected]
+
+- Update to version 2013.1.a70.g15cd9ac+git.1363006799.15cd9ac:
+ + Update oslo rpc libraries
+
+--------------------------------------------------------------------
+Mon Mar 11 09:55:39 UTC 2013 - [email protected]
+
+- Update to version 2013.1.a68.g9f70ee5+git.1362995739.9f70ee5:
+ + Fixed copy image to volume and clone volume.
+ + Fixes issues found in /os-hosts API
+ + sync oslo changes for setup / version
+ + NetApp: Fix for snapshot not deleted in error state.
+ + Switch to oslo.config.
+ + Add get_volume_stats in the sheepdog driver.
+ + Fix 3PAR drivers to work in multi-backend mode.
+ + Fix Storwize/SVC storage_protocol reporting.
+ + Exit run_tests with the result code of the test runner.
+ + Use nose and openstack nose plugin.
+ + Mark configuration option netapp_password secret
+ + NetApp bug fix for multibackend scenario.
+ + Pull newly merged Olso update for 'is' operator
+ + Update tox.ini to support RHEL 6.x.
+ + Remove/update unused log arguements in manager
+ + Fix volume capacity reporting
+ + Removing flags in RBD in favor of configuration
+ + Fix calling setUp() method of superclass from tearDown method.
+ + Fix a few bugs for LeftHand Grizzly
+ + LIO iSCSI initiator ACL auto-config
@@ -52,3 +143,166 @@
-- Update to version 2012.2.4+git.1360133755.a8caa79:
- + Final versioning for 2012.2.3
- + Bump version to 2012.2.4
+--------------------------------------------------------------------
+Tue Mar 5 17:24:09 UTC 2013 - [email protected]
+
+- Update to version 2013.1.a33.g15962a4+git.1362504249.15962a4:
+ + Improved fail_reason for cinder-backup swift connection errors
+ + Elevate context for delete volume with no host.
+ + Only use iscsi_helper config option if using LVMISCSIDriver
+ + Add some useful log to filter scheduler.
+ + swift backup service checks version during restore
+
+--------------------------------------------------------------------
+Thu Feb 28 14:14:47 UTC 2013 - [email protected]
+
+- Update to version 2013.1.a23.gdd01069+git.1362060887.dd01069:
+ + allow run_tests.sh to report why it failed
+ + XenAPINFS: Fix Volume always uploaded as vhd/ovf
+ + Changed to INFO level logging for main cinder-backup operations
+ + Fixes the provisioning on selected volumes for NetApp 7 mode.
+ + Fix query filter in volume_get_active_by_window()
+ + NetApp: Fix race condition in 7-mode iSCSI driver with DFM.
+ + Improve logging for volume operations via manager
+ + Convert from using FLAGS directly in SF driver.
+
+-------------------------------------------------------------------
+Tue Feb 26 17:15:30 UTC 2013 - [email protected]
+
+- add requires to python-rtslib
+
+-------------------------------------------------------------------
+Mon Feb 25 10:35:33 UTC 2013 - [email protected]
+
+- Init script cleanup:
++++ 383 more lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/openstack-cinder/openstack-cinder.changes
++++ and
/work/SRC/openSUSE:Factory/.openstack-cinder.new/openstack-cinder.changes
Old:
----
cinder-config-update.diff
cinder-include-migratecfg.patch
cinder-stable-folsom.tar.gz
enable-nosetests.diff
New:
----
cinder-stable-grizzly.tar.gz
cinder-sudoers
sqlalchemy-update.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-cinder-doc.spec ++++++
--- /var/tmp/diff_new_pack.lrRBdW/_old 2013-04-29 14:08:54.000000000 +0200
+++ /var/tmp/diff_new_pack.lrRBdW/_new 2013-04-29 14:08:54.000000000 +0200
@@ -19,20 +19,20 @@
%define component cinder
Name: openstack-%{component}-doc
-Version: 2012.2.4+git.1364083468.db0595a
-Release: 1
-License: Apache-2.0
+Version: 2013.1
+Release: 0
Summary: OpenStack Block Storage (Cinder) - Documentation
-Url: https://launchpad.net/cinder
+License: Apache-2.0
Group: Documentation/HTML
-Source: cinder-stable-folsom.tar.gz
+Url: https://launchpad.net/cinder
+Source: cinder-stable-grizzly.tar.gz
BuildRequires: graphviz
-BuildRequires: openstack-macros
+BuildRequires: openstack-suse-macros
BuildRequires: python-Paste
BuildRequires: python-PasteDeploy
BuildRequires: python-Routes
-BuildRequires: python-Sphinx
BuildRequires: python-SQLAlchemy
+BuildRequires: python-Sphinx
BuildRequires: python-WebOb
BuildRequires: python-base
BuildRequires: python-cinder = %{version}
@@ -40,14 +40,15 @@
BuildRequires: python-distribute
BuildRequires: python-eventlet
BuildRequires: python-feedparser
-BuildRequires: python-glanceclient
+BuildRequires: python-glanceclient < 2
BuildRequires: python-iso8601
BuildRequires: python-ldap
BuildRequires: python-lxml
BuildRequires: python-mox
+BuildRequires: python-oslo.config
BuildRequires: python-paramiko
-BuildRequires: python-suds
BuildRequires: python-sqlalchemy-migrate
+BuildRequires: python-suds
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -58,7 +59,7 @@
This package contains documentation files for %{name}.
%prep
-%setup -q -n cinder-2012.2.4
+%setup -q -n cinder-2013.1
%openstack_cleanup_prep
%build
++++++ openstack-cinder.spec ++++++
--- /var/tmp/diff_new_pack.lrRBdW/_old 2013-04-29 14:08:54.000000000 +0200
+++ /var/tmp/diff_new_pack.lrRBdW/_new 2013-04-29 14:08:54.000000000 +0200
@@ -21,32 +21,38 @@
%define username openstack-%{component}
Name: openstack-%{component}
-Version: 2012.2.4+git.1364083468.db0595a
-Release: 1
-License: Apache-2.0
+Version: 2013.1
+Release: 0
Summary: OpenStack Block Storage (Cinder)
-Url: https://launchpad.net/cinder
+License: Apache-2.0
Group: System/Management
-Source: cinder-stable-folsom.tar.gz
+Url: https://launchpad.net/cinder
+Source: cinder-stable-grizzly.tar.gz
Source1: %{name}.init
Source2: %{name}.logrotate
-# PATCH-FIX-UPSTREAM: [email protected] - Backport of
https://review.openstack.org/17347
-Patch0: cinder-include-migratecfg.patch
-# PATCH-SUSE: [email protected] - Set sane defaults for SUSE
-Patch1: cinder-config-update.diff
-Patch2: enable-nosetests.diff
+Source3: cinder-sudoers
+Patch0: sqlalchemy-update.diff
BuildRequires: fdupes
-BuildRequires: openstack-macros
+BuildRequires: openstack-suse-macros
+BuildRequires: openstack-suse-sudo
BuildRequires: python-base
BuildRequires: python-distribute >= 0.6.24
+BuildRequires: python-oslo.config >= 1.1.0
# Documentation build requirements:
+BuildRequires: openstack-utils
BuildRequires: python-Sphinx
-BuildRequires: python-eventlet
BuildRequires: python-WebOb
+BuildRequires: python-argparse
+BuildRequires: python-eventlet >= 0.9.12
BuildRequires: python-iso8601
+BuildRequires: python-paramiko
+BuildRequires: python-stevedore >= 0.8
Requires: logrotate
+Requires: openstack-suse-sudo
Requires: python >= 2.6.8
Requires: python-cinder = %{version}
+Requires: python-oslo.config
+Requires: python-swiftclient >= 1.2
%if 0%{?suse_version} > 1110
Requires(pre): pwdutils
%else
@@ -71,24 +77,26 @@
Group: Development/Languages/Python
Requires: python >= 2.6.8
Requires: python-Paste
-Requires: python-PasteDeploy
+Requires: python-PasteDeploy >= 1.5.0
Requires: python-Routes
Requires: python-SQLAlchemy >= 0.7.3
-Requires: python-WebOb
-Requires: python-amqplib
-Requires: python-anyjson
+Requires: python-WebOb >= 1.0.8
+Requires: python-amqplib >= 0.6.1
+Requires: python-anyjson >= 0.2.4
Requires: python-eventlet >= 0.9.17
Requires: python-glanceclient >= 0.5.0
Requires: python-greenlet >= 0.3.1
Requires: python-iso8601 >= 0.1.4
-Requires: python-kombu
+Requires: python-keystoneclient >= 0.2.0
+Requires: python-kombu >= 1.0.4
Requires: python-lockfile
Requires: python-lxml >= 2.3
-Requires: python-paramiko
+Requires: python-paramiko >= 1.8.0
Requires: python-python-daemon
Requires: python-sqlalchemy-migrate >= 0.7.2
-Requires: python-suds
-Requires: python-wsgiref
+Requires: python-stevedore >= 0.8
+Requires: python-suds >= 0.4
+Requires: python-wsgiref >= 0.1.2
%description -n python-cinder
Cinder is the OpenStack Block storage service. This is a spin out of
@@ -104,6 +112,14 @@
%description api
This package contains the OpenStack Cinder API.
+%package backup
+Summary: OpenStack Block Storage (Cinder) - Volume Backup Service
+Group: Development/Languages/Python
+Requires: %{name} = %{version}
+
+%description backup
+This package contains the OpenStack Cinder Backup Service.
+
%package scheduler
Summary: OpenStack Block Storage (Cinder) - Scheduler
Group: Development/Languages/Python
@@ -116,6 +132,8 @@
Summary: OpenStack Block Storage (Cinder) - Volume
Group: Development/Languages/Python
Requires: %{name} = %{version}
+Provides: openstack-nova-volume = 2013.1
+Obsoletes: openstack-nova-volume < 2013.1
%description volume
This package contains the OpenStack Cinder volume manager.
@@ -125,12 +143,15 @@
Group: Development/Languages/Python
Requires: %{name} = %{version}
Requires: git-core >= 1.6.4
-Requires: python-pylint
Requires: python-WebTest
-Requires: python-coverage
+Requires: python-amqp >= 1.0.5
Requires: python-cinderclient
+Requires: python-coverage
+Requires: python-glanceclient < 2
+Requires: python-hp3parclient >= 1.0.0
Requires: python-httplib2
Requires: python-ldap
+Requires: python-mock
Requires: python-mox
Requires: python-netifaces
Requires: python-nose
@@ -138,6 +159,7 @@
Requires: python-nosexcover
Requires: python-openstack.nose_plugin
Requires: python-pep8
+Requires: python-pylint
Requires: python-python-memcached
Requires: python-unittest2
@@ -146,25 +168,23 @@
functionality of OpenStack Cinder.
%prep
-%setup -q -n cinder-2012.2.4
-%patch0 -p1
-%patch1
-%patch2
+%setup -q -n cinder-2013.1
+%patch0
%openstack_cleanup_prep
-# FIXME: Fix path to test/policy.json due to our special test setup
-# maybe the code in cinder/utils.py#find_config could be fixed, too:
-# ConfigNotFound: Could not find config at
/usr/lib64/python2.6/site-packages/cinder/tests/cinder/tests/policy.json
-sed -i "s|cinder\/tests\/policy.json|policy.json|" ./cinder/tests/fake_flags.py
+# NOTE(saschpe): We don't build i18n message catalogs, thus:
+sed -i -e "s|Babel.*||" tools/pip-requires
+# NOTE(saschpe): We don't use setuptools.git, we use git(hub)_tarballs source
service:
+sed -i -e "s|setuptools_git>=0.4||" tools/pip-requires
%build
python setup.py build
-%openstack_sphinx_build_manpages_only
+python setup.py build_sphinx -b man
%install
python setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot}
### directories
-install -d -m 755 %{buildroot}%{_localstatedir}/{lib,log}/%{component}
+install -d -m 755 %{buildroot}%{_localstatedir}/{lib,log,run}/%{component}
install -d -m 755 %{buildroot}%{_sysconfdir}/%{component}
### configuration files
@@ -177,16 +197,15 @@
### init scripts
mkdir -p %{buildroot}%{_sbindir} %{buildroot}%{_initddir}
-for i in api volume scheduler ; do
- tmp=$(mktemp)
- cat %{SOURCE1} | sed "s/__NAME__/$i/g" > $tmp
- if [ "x$i" = "xcompute" ] ; then
- sed -i -e "s/# Should-Start:.*/& libvirtd/" $tmp
- fi
- install -m 755 $tmp %{buildroot}%{_initddir}/%{name}-$i
+for i in api backup scheduler volume ; do
+ install -m 755 %{SOURCE1} %{buildroot}%{_initddir}/%{name}-$i
+ sed -i -e "s/__NAME__/$i/g" %{buildroot}%{_initddir}/%{name}-$i
ln -s ../..%{_initddir}/%{name}-$i %{buildroot}%{_sbindir}/rc%{name}-$i
done
+### sudoers configuration for cinder-rootwrap:
+install -D -m 440 %{SOURCE3}
%{buildroot}%{_sysconfdir}/sudoers.d/openstack-cinder
+
### documentation
install -d %{buildroot}%{_mandir}/man1
install -m 644 doc/build/man/*.1 %{buildroot}%{_mandir}/man1
@@ -198,9 +217,22 @@
### misc
%fdupes %{buildroot}%{python_sitelib}/%{component}
+### set default configuration (mostly applies to package-only setups and
quickstart, i.e. not generally crowbar)
+%define cinder_conf %{buildroot}%{_sysconfdir}/cinder/cinder.conf
+openstack-config --set %{cinder_conf} DEFAULT verbose True
+#NOTE(saschpe): Don't set 'log_file', each cinder deamon will create it's own
if only 'log_dir' is set:
+openstack-config --set %{cinder_conf} DEFAULT log_dir /var/log/cinder
+openstack-config --set %{cinder_conf} DEFAULT auth_strategy keystone
+openstack-config --set %{cinder_conf} DEFAULT rootwrap_config
/etc/cinder/rootwrap.conf
+openstack-config --set %{cinder_conf} DEFAULT state_path /var/lib/cinder
+#NOTE(saschpe): Do we want to use sqlite per default or demand PostgreSQL
right away?
+openstack-config --set %{cinder_conf} DEFAULT sql_connection
sqlite:////var/lib/cinder/cinder.db
+#NOTE(saschpe): Can't hurt to set the default volume_group, only the LVM
driver has a it otherwise:
+openstack-config --set %{cinder_conf} DEFAULT volume_group cinder-volumes
+
%pre
getent group %{groupname} >/dev/null || groupadd -r %{groupname}
-getent passwd %{username} >/dev/null || useradd -r -g %{groupname} -d
%{_localstatedir}/lib/%{component} -s /sbin/nologin -c "OpenStack Cinder"
%{username}
+getent passwd %{username} >/dev/null || useradd -r -g %{groupname} -d
%{_localstatedir}/lib/%{component} -s /sbin/nologin -c "OpenStack Cinder
Daemons" %{username}
exit 0
%post api
@@ -213,6 +245,15 @@
%restart_on_update %{name}-api
%insserv_cleanup
+%post backup
+
+%preun backup
+%stop_on_removal %{name}-backup
+
+%postun backup
+%restart_on_update %{name}-backup
+%insserv_cleanup
+
%post scheduler
%{fillup_and_insserv -f %{name}-scheduler}
@@ -236,15 +277,17 @@
%files
%defattr(-,root,root)
%doc LICENSE README.rst
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/lib/%{component}
+%dir %attr(0750, %{username}, %{groupname}) %{_localstatedir}/log/%{component}
+%ghost %dir %attr(0750, %{username}, %{groupname})
%{_localstatedir}/run/%{component}
%dir %{_sysconfdir}/%{component}
-%config(noreplace) %attr(0640, root, %{groupname})
%{_sysconfdir}/%{component}/api-paste.ini
-%config(noreplace) %attr(0640, root, %{groupname})
%{_sysconfdir}/%{component}/%{component}.conf
-%config(noreplace) %{_sysconfdir}/%{component}/policy.json
-%config(noreplace) %{_sysconfdir}/%{component}/rootwrap.conf
%dir %{_sysconfdir}/%{component}/rootwrap.d
-%dir %attr(0755, %{username}, root) %{_localstatedir}/lib/%{component}
-%dir %attr(0755, %{username}, %{groupname}) %{_localstatedir}/log/%{component}
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%config %{_sysconfdir}/sudoers.d/openstack-cinder
+%config %attr(0640, root, %{groupname})
%{_sysconfdir}/%{component}/api-paste.ini
+%config(noreplace) %attr(0640, root, %{groupname})
%{_sysconfdir}/%{component}/%{component}.conf
+%config %{_sysconfdir}/%{component}/policy.json
+%config %{_sysconfdir}/%{component}/rootwrap.conf
%{_bindir}/%{component}-all
%{_bindir}/%{component}-clear-rabbit-queues
%{_bindir}/%{component}-manage
@@ -265,6 +308,13 @@
%{_sbindir}/rc%{name}-api
%{_bindir}/%{component}-api
+%files backup
+%defattr(-,root,root,-)
+%doc LICENSE
+%{_initddir}/%{name}-backup
+%{_sbindir}/rc%{name}-backup
+%{_bindir}/%{component}-backup
+
%files scheduler
%defattr(-,root,root,-)
%doc LICENSE
@@ -275,7 +325,7 @@
%files volume
%defattr(-,root,root,-)
%doc LICENSE
-%config(noreplace) %{_sysconfdir}/%{component}/rootwrap.d/volume.filters
+%config %{_sysconfdir}/%{component}/rootwrap.d/volume.filters
%{_initddir}/%{name}-volume
%{_sbindir}/rc%{name}-volume
%{_bindir}/%{component}-volume
++++++ _service ++++++
--- /var/tmp/diff_new_pack.lrRBdW/_old 2013-04-29 14:08:54.000000000 +0200
+++ /var/tmp/diff_new_pack.lrRBdW/_new 2013-04-29 14:08:54.000000000 +0200
@@ -1,6 +1,7 @@
<services>
<service name="git_tarballs" mode="disabled">
- <param
name="url">http://tarballs.openstack.org/cinder/cinder-stable-folsom.tar.gz</param>
- <param name="email">[email protected]</param>
+ <param
name="url">http://tarballs.openstack.org/cinder/cinder-stable-grizzly.tar.gz</param>
+ <param name="email">[email protected]</param>
+ <param name="plain-version">True</param>
</service>
</services>
++++++ cinder-sudoers ++++++
openstack-cinder ALL = (root) NOPASSWD: /usr/bin/cinder-rootwrap
/etc/cinder/rootwrap.conf *
++++++ openstack-cinder.init ++++++
--- /var/tmp/diff_new_pack.lrRBdW/_old 2013-04-29 14:08:54.000000000 +0200
+++ /var/tmp/diff_new_pack.lrRBdW/_new 2013-04-29 14:08:54.000000000 +0200
@@ -2,86 +2,75 @@
### BEGIN INIT INFO
# Provides: openstack-cinder-__NAME__
-# Required-Start: $network $remote_fs $syslog
+# Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
-# Should-Start: rabbitmq-server mysql postgresql
-# Should-Stop: rabbitmq-server mysql postgresql
+# Should-Start: mysql postgresql rabbitmq-server
+# Should-Stop: mysql postgresql rabbitmq-server
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
-# Short-Description: Cinder __NAME__ server
-# Description: Cinder __NAME__ server.
+# Short-Description: OpenStack Block Storage (Cinder) - __NAME__
+# Description: OpenStack Block Storage (Cinder) - __NAME__
### END INIT INFO
-name="__NAME__"
+DAEMON="__NAME__"
USER="openstack-cinder"
-GROUP="nobody"
-CONFIGFILE="/etc/cinder/cinder.conf"
+CONFFILE="/etc/cinder/cinder.conf"
RUNDIR="/var/run/cinder"
-LOGFILE="/var/log/cinder/$name.log"
-[ -e "/etc/sysconfig/openstack-cinder-$name" ] && .
"/etc/sysconfig/openstack-cinder-$name"
+# $RUNDIR can be tmpfs, thus we have to create/own it here:
+mkdir -p $RUNDIR && chown $USER. $RUNDIR
-[ -e $LOGFILE ] || touch $LOGFILE
-mkdir -p $RUNDIR
-chown $USER. $RUNDIR $LOGFILE
-
-DAEMON_OPTIONS="--config-file=$CONFIGFILE --log-file=$LOGFILE"
-OPTIONS="${OPTIONS} $DAEMON_OPTIONS"
-
-# Shell functions sourced from /etc/rc.status:
-# rc_check check and set local and overall rc status
-# rc_status check and set local and overall rc status
-# rc_status -v be verbose in local rc status and clear it afterwards
-# rc_status -v -r ditto and clear both the local and overall rc status
-# rc_status -s display "skipped" and exit with status 3
-# rc_status -u display "unused" and exit with status 3
-# rc_failed set local and overall rc status to failed
-# rc_failed <num> set local and overall rc status to <num>
-# rc_reset clear both the local and overall rc status
-# rc_exit exit appropriate to overall rc status
-# rc_active checks whether a service is activated by symlinks
. /etc/rc.status
-FULLNAME="OpenStack::Cinder $name server"
-CHUSER="-u $USER"
-
case "$1" in
start)
- echo -n "Starting $FULLNAME"
- startproc -s $CHUSER -t ${STARTUP_TIMEOUT:-5} -q /usr/bin/cinder-$name
$OPTIONS
+ echo -n "Checking for DB Migrations"
+ /usr/bin/cinder-manage db sync
+ rc_status -v
+
+ echo -n "Starting cinder-$DAEMON"
+ /sbin/startproc -q -s -u $USER /usr/bin/cinder-$DAEMON
--config-file=$CONFFILE
rc_status -v
;;
stop)
- echo -n "Shutting down $FULLNAME"
- killproc /usr/bin/cinder-$name
+ echo -n "Shutting down cinder-$DAEMON"
+ /sbin/killproc /usr/bin/cinder-$DAEMON
rc_status -v
;;
restart)
$0 stop
- $0 start
- rc_status
+ $0 start
+ rc_status
+ ;;
+ force-reload)
+ $0 try-restart
+ rc_status
;;
reload)
+ echo -n "Reload service cinder-$DAEMON"
+ rc_failed 3
+ rc_status -v
;;
status)
- echo -n "Checking $FULLNAME"
- /sbin/checkproc /usr/bin/cinder-$name
- rc_status -v
- ;;
- condrestart|try-restart)
- if test "$1" = "condrestart"; then
- echo "${attn} Use try-restart ${done}(LSB)${attn} rather than
condrestart ${warn}(RH)${norm}"
- fi
- $0 status
- if test $? = 0; then
- $0 restart
- else
- rc_reset # Not running is not a failure.
- fi
- rc_status
- ;;
+ echo -n "Checking for service cinder-$DAEMON"
+ /sbin/checkproc /usr/bin/cinder-$DAEMON
+ rc_status -v
+ ;;
+ try-restart|condrestart)
+ if test "$1" = "condrestart"; then
+ echo "${attn} Use try-restart ${done}(LSB)${attn} rather than
condrestart ${warn}(RH)${norm}"
+ fi
+ $0 status
+ if test $? = 0; then
+ $0 restart
+ else
+ rc_reset # Not running is not a failure.
+ fi
+ rc_status # Remember status and be quiet
+ ;;
*)
- echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart}"
- exit 2
+ echo "Usage: $0
{start|stop|status|try-restart|restart|force-reload|reload}"
+ exit 1
+ ;;
esac
-exit $?
+rc_exit
++++++ openstack-cinder.logrotate ++++++
--- /var/tmp/diff_new_pack.lrRBdW/_old 2013-04-29 14:08:54.000000000 +0200
+++ /var/tmp/diff_new_pack.lrRBdW/_new 2013-04-29 14:08:54.000000000 +0200
@@ -1,5 +1,13 @@
+compress
+
/var/log/cinder/*.log {
- daily
+ rotate 15
+ size 1M
+ weekly
+ dateext
missingok
+ notifyempty
su openstack-cinder openstack-cinder
+ copytruncate
+ sharedscripts
}
++++++ sqlalchemy-update.diff ++++++
--- cinder.egg-info/requires.txt
+++ cinder.egg-info/requires.txt
@@ -1,4 +1,4 @@
-SQLAlchemy>=0.7.3,<=0.7.9
+SQLAlchemy>=0.7.3,<=0.7.99
amqplib>=0.6.1
anyjson>=0.2.4
eventlet>=0.9.17
@@ -21,4 +21,4 @@
python-glanceclient>=0.5.0,<2
python-keystoneclient>=0.2.0
python-swiftclient
-oslo.config>=1.1.0
\ No newline at end of file
+oslo.config>=1.1.0
--- tools/pip-requires
+++ tools/pip-requires
@@ -1,4 +1,4 @@
-SQLAlchemy>=0.7.3,<=0.7.9
+SQLAlchemy>=0.7.3,<=0.7.99
amqplib>=0.6.1
anyjson>=0.2.4
argparse
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
