[gerrit]
-host=gerrit.mirantis.com
+host=review.fuel-infra.org
port=29418
-project=openstack-ci/openstack/cinder-build
+project=openstack-build/cinder-build
defaultbranch=master
+++ /dev/null
-Migration from nova-volumes to cinder-volumes:
-
-1. upgrade your nova install to folsom
-2. upgrade your nova database using nova-manage db sync
-3. install the folsom version of cinder
-4. create a cinder database using cinder-manage db sync
-5. copy data from nova database using cinder-manage migrate import_db --src=$NOVA_SQL_CONN --dest=$CINDER_SQL_CONN
-6. disable the nova-volume-api in enabled apis in /etc/nova/nova.conf sed -i "s/osapi_volume,// /etc/nova/nova.conf"
-7. restart nova-api
-8. start cinder-api
+++ /dev/null
-cinder (1:2014.2~b2-0ubuntu1) utopic; urgency=medium
-
- * New upstream release.
- * Clean up dependencies:
- - debian/control: Dropped python-d2to1, python-hp3parclient,
- python-hplefthandclient, python-lockfile, python-amqplib
- - debian/control: Add python-oslosphinx, python-requests,
- python-hacking, python-oslo.db.
- * debian/patches/fix-requirements.patch: Refreshed.
-
- -- Chuck Short <zulcss@ubuntu.com> Thu, 24 Jul 2014 13:44:04 -0400
-
-cinder (1:2014.2~b1-0ubuntu2) utopic; urgency=medium
-
- * SECURITY UPDATE: specify /etc/nova/rootwrap.conf for use with
- nova-rootwrap
- - CVE-2013-1068 (LP: #1185019)
-
- -- Chuck Short <zulcss@ubuntu.com> Wed, 18 Jun 2014 11:37:45 -0400
-
-cinder (1:2014.2~b1-0ubuntu1) utopic; urgency=medium
-
- * New upstream release.
- * debian/control: Open up juno release
- * debian/patches/fix-requirements.patch: Refreshed.
-
- -- Chuck Short <zulcss@ubuntu.com> Thu, 12 Jun 2014 10:35:06 -0400
-
-cinder (1:2014.1-0ubuntu1) trusty; urgency=medium
-
- * New upstream release (LP: #1299055).
-
- -- Corey Bryant <corey.bryant@canonical.com> Wed, 16 Apr 2014 13:06:37 -0400
-
-cinder (1:2014.1~rc3-0ubuntu1) trusty; urgency=medium
-
- * New release candidate (LP: #1299010).
-
- -- Chuck Short <zulcss@ubuntu.com> Tue, 15 Apr 2014 09:02:40 -0400
-
-cinder (1:2014.1~rc2-0ubuntu1) trusty; urgency=medium
-
- * New upstream release (LP: #1299010).
-
- -- Chuck Short <zulcss@ubuntu.com> Mon, 07 Apr 2014 11:18:57 -0400
-
-cinder (1:2014.1~rc1-0ubuntu1) trusty; urgency=medium
-
- * New upstream release (LP: #1299010).
- * debian/patches/fixup-rbd-str-handling.patch: Dropped no longer needed.
- * debian/patches/fix-requirements.patch: Rediffed.
- * debian/control: Add python-oslo.messaging.
-
- -- Chuck Short <zulcss@ubuntu.com> Fri, 28 Mar 2014 09:48:21 -0400
-
-cinder (1:2014.1~b3-0ubuntu3) trusty; urgency=medium
-
- * d/p/fixup-rbd-str-handling.patch: Cherry pick fix from upstream
- Gerrit to resolve issue deleting Ceph volumes and snapshots
- (LP: #1292433).
- * d/control,rules: Use upstream run_tests.sh wrapper to execute unit tests,
- add subunit to BD's to ensure output is correctly formatted.
-
- -- James Page <james.page@ubuntu.com> Fri, 14 Mar 2014 11:19:16 +0000
-
-cinder (1:2014.1~b3-0ubuntu2) trusty; urgency=medium
-
- * d/cinder-common.postinst: Correct use of getent (LP: #1224275).
- * d/cinder-common.postinst: Tidy detection of local sqlite database use
- for db sync operations (LP: #1290423).
-
- -- James Page <james.page@ubuntu.com> Thu, 13 Mar 2014 10:11:20 +0000
-
-cinder (1:2014.1~b3-0ubuntu1) trusty; urgency=medium
-
- [ Chuck Short ]
- * debian/patches/fix-requirements.patch: Refreshed.
- * debian/control: Bump python-keystoneclient to 0.4.2.
- * debian/patches/skip-tests.patch: Temporarily skip
- testlefthand tests since the needed python library hasnt been
- packaged yet.
-
- [ James Page ]
- * d/p/fix-requirements.patch: Refreshed.
- * d/control,d/p/series/skip-tests.patch: Add BD on python-hplefthandclient,
- bump version requirement on python-hp3parclient to >= 3.0.0 and drop
- patch that skips hplefthandclient tests.
-
- [ Corey Bryant ]
- * New upstream release.
-
- -- Corey Bryant <corey.bryant@canonical.com> Thu, 06 Mar 2014 13:16:02 -0500
-
-cinder (1:2014.1~b2-0ubuntu1) trusty; urgency=low
-
- [ James Page ]
- * d/control: Add versioned dependency python-six >= 1.4.1 (LP: #1259203).
- * d/p/*: Refreshed.
-
- [Chuck Short]
- * New upstream release.
- * debian/control: Add python-taskflow as a dependency.
- * debian/control: Add python-oslo.rootwrap as a dependency.
-
- -- Chuck Short <zulcss@ubuntu.com> Thu, 23 Jan 2014 12:41:54 -0500
-
-cinder (1:2014.1~b1-0ubuntu1) trusty; urgency=low
-
- [ Chuck Short ]
- * New upstream release.
- * debian/control:
- - Open icehouse release.
- - Add python-rtslib as a dependency.
- * debian/patches/fix-sqlalchemy-requirements.patch: Dropped no longer needed.
- * debian/patches/fix-babel-requirements.patch: Dropped no longer needed.
- * debian/paches/fix-requirements.patch: Fixed up requirements.txt for
- dependencies we have in Ubuntu.
- * debian/cinder-common.install: Add "cinder-rtstool".
-
- [ James Page ]
- * debian/patches/*: Refresh.
-
- -- Chuck Short <zulcss@ubuntu.com> Thu, 05 Dec 2013 21:30:40 -0500
-
-cinder (1:2013.2-0ubuntu1) saucy; urgency=low
-
- * New upstream release (LP: #1236462).
-
- -- Chuck Short <zulcss@ubuntu.com> Thu, 17 Oct 2013 10:00:43 -0400
-
-cinder (1:2013.2~rc3-0ubuntu1) saucy; urgency=low
-
- * New upstream release candidate (LP: #1240254).
-
- -- James Page <james.page@ubuntu.com> Wed, 16 Oct 2013 08:59:28 +0100
-
-cinder (1:2013.2~rc2-0ubuntu1) saucy; urgency=low
-
- * New upstream release candidate (LP: #1239156).
-
- -- James Page <james.page@ubuntu.com> Sat, 12 Oct 2013 16:52:11 +0100
-
-cinder (1:2013.2~rc1-0ubuntu1) saucy; urgency=low
-
- * New upstream release candidate.
- * debian/patches/skip-sqlachemy-failures.patch: Dropped
- * debian/patches/fix-sqlalchemy-requirements.patch: Refreshed.
- * debian/patches/fix-babel-requirements.patch: Revert dependency requirement
- for python-babel.
- * debian/control:
- - Dropped python-nose and python-setuptool-git.
- - Added python-netaddr as a build-dependency. (LP: #1227153)
- - Added python-six as a build-dependency.
- - Added versioned dependencies to python-pbr, python-amqplib,
- python-glanceclient, python-novaclient, and python-swiftclient,
- python-lxml, python-webob, python-oslo.config, python-sqlalchemy,
- python-fixtures, python-testtools, and python-fixtures
- - Bumped versioned dependencies for python-eventlet, python-hp3parclient,
- python-keystoneclient, and python-novaclient
-
- -- Chuck Short <zulcss@ubuntu.com> Fri, 04 Oct 2013 08:40:26 -0400
-
-cinder (1:2013.2~b3-0ubuntu1) saucy; urgency=low
-
- [ James Page ]
- * d/control: Switch ceph-common -> python-ceph inline with upstream
- refactoring of Ceph RBD driver, move to Suggests of python-cinder.
- (LP: #1190791).
-
- [ Adam Gandelman ]
- * debian/patches/avoid_paramiko_vers_depends.patch: Dropped, no longer
- required.
- * Add minimum requirement python-greenlet (>= 0.3.2).
- * Add minimum requirement python-eventlet (>= 0.12.0).
- * Add minimum requirement python-paramiko (>= 1.8).
-
- [ Chuck Short ]
- * New upstream release.
- * debian/patches/skip-sqlachemy-failures.patch: Skip testfailures
- with sqlalchemy 0.8 until they are fixed upstream.
- * debian/control: Add python-babel to build-depends.
- * debian/control: Add python-novaclient to build-depends.
-
- -- Chuck Short <zulcss@ubuntu.com> Sun, 08 Sep 2013 21:09:46 -0400
-
-cinder (1:2013.2~b2-0ubuntu3) saucy; urgency=low
-
- * debian/patches/fix-sqlalchemy-requirements.patch: Fix requirements for sqlalchemy
- 0.8.
-
- -- Chuck Short <zulcss@ubuntu.com> Mon, 22 Jul 2013 10:03:52 -0400
-
-cinder (1:2013.2~b2-0ubuntu2) saucy; urgency=low
-
- * d/rules: Disable test parallel execution; causing FTBFS when high
- levels of concurrency occur on buildds.
-
- -- James Page <james.page@ubuntu.com> Sun, 21 Jul 2013 10:10:10 +0100
-
-cinder (1:2013.2~b2-0ubuntu1) saucy; urgency=low
-
- [ Chuck Short ]
- * debian/patches/avoid_paramiko_vers_depends.patch: Refreshed
- * debian/control: Add missing testrepostory.
- * debian/rules: Use testr directly.
-
- [ Adam Gandelman ]
- * debian/control:
- - Add minimum requirement python-anyjson (>= 0.3.3).
- - Add minimum requirement python-keystoneclient (>= 0.2.3).
- - Add minimum requirement python-kombu (>= 2.5.12).
-
- [ James Page ]
- * New upstream release.
- * d/control: Update VCS fields for new branch locations.
- * d/rules: Run unit tests in parallel.
-
- -- James Page <james.page@ubuntu.com> Fri, 19 Jul 2013 14:14:40 +0100
-
-cinder (1:2013.2~b1-0ubuntu2) saucy; urgency=low
-
- [ Chuck Short ]
- * debian/patches/avoid_paramiko_vers_depends.patch: Refreshed
-
- [ Adam Gandelman ]
- * debian/control: Bump min. stevedore version >= 0.9.
-
- [Yolanda Robla]
- * debian/tests: Added autopkgtests.
-
- -- Chuck Short <zulcss@ubuntu.com> Wed, 19 Jun 2013 12:45:18 -0500
-
-cinder (1:2013.2~b1-0ubuntu1) saucy; urgency=low
-
- [ Chuck Short ]
- * New upstream version.
- * debian/patches/fix_cinder_dependencies.patch: Dropped.
- * debian/control: Bump standards version to 3.9.4.
- * debian/control: Add python-pbr and python-d2to1 to build-depends.
- * debian/control: Add python-testtools and python-fixtures to build-depends
- * debian/rules: Add work around to remove wonky setup.py setup
- * debian/cinder-common.install: Add cinder-rpc-zmq-receiver binary.
-
- [ James Page ]
- * debian/control: Drop surplus dependency on python-glance (LP: #1175600).
- * debian/control,rules: Drop dependency on pep8, don't run pep8 tests during
- package build process (its just way to late).
- * debian/control: Drop surplus BD on python-cheetah.
-
- [ Adam Gandelman ]
- * debian/patches/avoid_paramiko_vers_depends.patch: Avoid version
- requirement on paramiko.
-
- -- Chuck Short <zulcss@ubuntu.com> Fri, 31 May 2013 10:01:03 -0500
-
-cinder (1:2013.1-0ubuntu2) raring; urgency=low
-
- * debian/control: Bump minimum stevedore version 0.8.
- (LP: #1169730)
-
- -- Adam Gandelman <adamg@ubuntu.com> Tue, 16 Apr 2013 14:38:46 -0700
-
-cinder (1:2013.1-0ubuntu1) raring; urgency=low
-
- * New upstream release.
-
- -- Chuck Short <zulcss@ubuntu.com> Fri, 05 Apr 2013 07:53:23 -0500
-
-cinder (1:2013.1~rc3-0ubuntu1) raring; urgency=low
-
- * New upstream release.
-
- -- Chuck Short <zulcss@ubuntu.com> Wed, 27 Mar 2013 07:51:21 -0500
-
-cinder (1:2013.1~rc2-0ubuntu2) raring; urgency=low
-
- * debian/rules: Fix FTBFS, we want '-v' and not '-V'.
-
- -- Chuck Short <zulcss@ubuntu.com> Mon, 25 Mar 2013 08:30:42 -0500
-
-cinder (1:2013.1~rc2-0ubuntu1) raring; urgency=low
-
- * New upstream release.
- * debian/control, debian/cinder-volume.install: Dropped rtstool and python-rtslib
- since it was dropped upstream.
- * debian/rules: Run tests more verbosely.
-
- -- Chuck Short <zulcss@ubuntu.com> Mon, 25 Mar 2013 07:59:45 -0500
-
-cinder (1:2013.1~rc1-0ubuntu1) raring; urgency=low
-
- [ Chuck Short ]
- * debian/patches/fix-ubuntu-tests.patch: Dropped.
- * debian/rules: Fix version number when building the testsuite.
- * debian/cinder-backup{.install, upstart, logroate}: Add cinder-backup
- service.
- * debian/rules: Run the testsuite against PYTHONPATH.
- * debian/control: Update build-depends and run-time depends.
- - Dropped python-glance not needed.
- - Dropped python-cheetah not needed.
- - Droped python-daemon not needed.
- - Dropped python-netaddr not needed.
- - Renamed python-oslo-config to python-oslo.config.
- - Added python-keystoneclient to depends.
- - Added python-swiftclient to depends.
- * debian/pydist-overrides: No longer needed.
-
- [ James Page ]
- * New upstream release candidate.
- * d/watch: Update uversionmangle to deal with upstream versioning
- changes, remove tarballs.openstack.org.
- * d/cinder.conf: Set lock_path to /var/lock/cinder (default is not
- sensible).
-
- -- James Page <james.page@ubuntu.com> Sat, 16 Mar 2013 09:30:20 +0000
-
-cinder (2013.1.g3-0ubuntu1) raring; urgency=low
-
- [ Yolanda Robla Mota ]
- * d/control: Add BD on python-hp3parclient.
- * d/patches: Drop patches related to disabling hp3parclient.
-
- [ James Page ]
- * d/control: Add Suggests: python-hp3parclient for python-cinder.
- * d/control: Add BD on python-oslo-config.
- * d/*: Wrapped and sorted.
-
- [ Chuck Short ]
- * New upstream release.
- * debian/rules, debian/cinder-volumes.install:
- - Fail if binaries are missing and install missing binaries.
- * debian/patches/fix-ubuntu-tests.patch: Fix failing tests.
- * debian/control: Add python-rtslib and python-mock.
-
- -- Chuck Short <zulcss@ubuntu.com> Fri, 22 Feb 2013 10:45:17 -0600
-
-cinder (2013.1~g2-0ubuntu2) raring; urgency=low
-
- * debian/patches/series: Enable skip_failed_tests to fix FTBFS.
-
- -- Chris J Arges <chris.j.arges@canonical.com> Tue, 15 Jan 2013 10:10:28 -0600
-
-cinder (2013.1~g2-0ubuntu1) raring; urgency=low
-
- [ Chuck Short ]
- * New upstream release.
- * debian/patches/avoid_setuptools_git_dependency.patch: Rediff
- due to upstream changes.
- * debian/control: Add python-keystoneclient as a dependency
-
- [ James Page ]
- * Improve upstart configurations:
- - d/*.upstart: Switch to using start-stop-daemon instead of su,
- stop on [!2345] to catch all transitions.
- * d/control: General tidy of package descriptions.
- * d/control: Drop BD on python-all-dev as its not required.
- * d/*.postrm: Dropped; update-rc.d calls for purge are handled by
- debhelper and are not require for upstart configurations.
-
- [ Yolanda Robla Mota ]
- * d/patches: removing hp3parclient dependency from tools/test-requires
- * d/patches, d/control: adding stevedore dependency, merging deps patches
- * d/patches: remove failing tests
-
- -- Chuck Short <zulcss@ubuntu.com> Fri, 11 Jan 2013 07:33:57 -0600
-
-cinder (2013.1~g1-0ubuntu1) raring; urgency=low
-
- * New upstream release.
- * debian/patches/avoid_setuptools_git_dependency.patch:
- Avoid git installation. (LP: #1075948)
-
- -- Chuck Short <zulcss@ubuntu.com> Fri, 23 Nov 2012 08:39:28 -0600
-
-cinder (2013.1~g1~20121101.361-0ubuntu1) raring; urgency=low
-
- [ Adam Gandelman ]
- * New upstream release.
- * debian/patches/0001-Replace-builtin-hash.patch: Dropped.
-
- [ James Page ]
- * Cinder should suggest ceph-common, not python-ceph (LP: #1065901):
- - debian/control: cinder-volume Suggests: python-ceph -> ceph-common
-
- -- Adam Gandelman <adamg@canonical.com> Thu, 01 Nov 2012 11:30:15 +0100
-
-cinder (2012.2-0ubuntu2) quantal; urgency=low
-
- * debian/cinder_tgt.conf: Add missing configuration file. (LP: #1064366)
- * debian/README.Debian: Added note about migration from nova-volume
- to cinder-volume.
-
- -- Chuck Short <zulcss@ubuntu.com> Tue, 09 Oct 2012 08:26:21 -0500
-
-cinder (2012.2-0ubuntu1) quantal; urgency=low
-
- * New upstream release.
- * debian/cinder-volume.postinst, debian/cinder-common.dirs,
- debian/cinder.conf: Properly configure tgtd to be used with cinder.
- * debian/pydist-overrides: Dont try to install babel.
-
- -- Chuck Short <zulcss@ubuntu.com> Thu, 27 Sep 2012 11:32:27 -0500
-
-cinder (2012.2~rc3-0ubuntu1) quantal; urgency=low
-
- * New upstream release.
- * debian/patches/0001-Replace-builtin-hash-with-MD5-to-solve-32-64-bit-iss.patch:
- Fix FTBFS.
-
- -- Chuck Short <zulcss@ubuntu.com> Wed, 26 Sep 2012 14:07:35 -0500
-
-cinder (2012.2~rc2-0ubuntu1) quantal; urgency=low
-
- [ Adam Gandelman ]
- * debian/control: Add python-mysqldb to python-cinder Depends.
-
- [ Chuck Short ]
- * New upstream release
- * debian/rules: Fail to build if the testsuite doesnt pass.
-
- -- Chuck Short <zulcss@ubuntu.com> Tue, 25 Sep 2012 10:17:21 -0500
-
-cinder (2012.2~rc1-0ubuntu1) quantal; urgency=low
-
- [ Adam Gandelman ]
- * debian/control: Add lvm2 + tgt as a Dependency of cinder-volume.
- * debian/cinder-volume.{dirs, postinst}:
- - Create /var/lib/cinder/volumes (LP: #1047059)
- - chmod 0600, not chown.
- * debain/cinder-scheduler.postinst: Drop.
- * debian/cinder.conf: Fix defaults.
- * debian/*.upstart: Specify --log-file.
- * debian/*.logrotate: Update.
- * Only rootwrap filters with the packages that need them (cinder-volume).
- * Ensure /etc/cinder/rootwrap.d/ is only writable by root, ensure
- those permissions on /etc/cinder/rootwrap.conf and individual filter
- configurations.
-
- [ Chuck Short ]
- * New upstream version.
- * debian/control: Add python-ceph as a suggests
-
- -- Chuck Short <zulcss@ubuntu.com> Tue, 18 Sep 2012 14:24:45 -0500
-
-cinder (2012.2~rc1~20120907.230-0ubuntu4) quantal; urgency=low
-
- [Chuck Short]
- * New upstream version.
- * debian/cinder.conf: Fix path for cinder-rootwrap. (LP: #1045438)
- * debian/control: Add python-glanceclient as a dep.
- * debian/cinder-common.postinst: Fix chmod thinko.
- * debian/*.upstart: Specify the configuration files.
-
- [Soren Hansen]
- * Update debian/watch to account for symbolically named tarballs and
- use newer URL.
- * Fix Launchpad URLs in debian/watch.
-
- -- Chuck Short <zulcss@ubuntu.com> Fri, 07 Sep 2012 11:27:55 -0500
-
-cinder (2012.2~f3-0ubuntu3) quantal; urgency=low
-
- * debian/cinder.conf: Re-add sql_connection and set it to sqllite.
-
- -- Chuck Short <zulcss@ubuntu.com> Wed, 22 Aug 2012 20:14:41 -0500
-
-cinder (2012.2~f3-0ubuntu2) quantal; urgency=low
-
- * debian/cinder.conf: Get rid of deprecated warnings.
- (LP: #1036240)
-
- -- Chuck Short <zulcss@ubuntu.com> Sun, 19 Aug 2012 13:36:22 -0500
-
-cinder (2012.2~f3-0ubuntu1) quantal; urgency=low
-
- * New upstream version.
- * debian/patches/0001-Use-setuptools-git.patch: Dropped
- * debian/control: Add python-glanceclient
-
- -- Chuck Short <zulcss@ubuntu.com> Fri, 17 Aug 2012 10:18:57 -0500
-
-cinder (2012.2~f3~20120809.102-0ubuntu2) quantal; urgency=low
-
- * debian/cinder.conf, cinder-common.install: Use rootwrap.conf. (LP: #1036240)
- * debian/control: Drop python-babel.
-
- -- Chuck Short <zulcss@ubuntu.com> Mon, 13 Aug 2012 14:14:31 -0500
-
-cinder (2012.2~f3~20120809.102-0ubuntu1) quantal; urgency=low
-
- [ Adam Gandelman ]
- * debian/control: Add python-setuptools dependency.
- * debian/cinder-common.postinst: Fix syntax errors, fix permissions.
- * debian/cinder-common.dirs: Correct, etc/nova -> etc/cinder.
- * debian/{cinder_sudoers, rules, cinder-common.install}: Install proper
- cinder_sudoers.
- * debian/cinder-*.upstart: Close quotes, replace 'nova' references with
- 'cinder'.
- * debian/cinder.conf: Specify correct sql_connection.
- * debian/cinder-scheduler.postinst: Added. Migrate local databases only.
-
- [ Chuck Short ]
- * debian/*.upstart: Fix upstart jobs to run with right interfaces.
- (LP: #1030197)
- * debian/control: Drop python-babel, python-nosexcover
- * debian/control: Add python-mox, pep8
- * debian/rules: Re-add get-orig-source
- * debian/rules: Enable testsuite.
- * debian/cinder.conf: Update config file.
- * debian/cinder-{api,volumes,scheduler}.manpages: Add manpages.
- * New upstream version.
- * debian/rules: Don't run pep8 tests
- * debian/patches/0001-Use-setuptools-git.patch: Cleanup manifest
- * debian/control: Add python-setuptools-git
- * debian/control: Add section for python-cinder
- * fix lintian warnings and errors.
- * debian/cinder-common.install: Remove clear_rabbit_queues since it
- will conflict with nova installed.
-
- -- Chuck Short <zulcss@ubuntu.com> Fri, 10 Aug 2012 12:05:11 -0500
-
-cinder (2012.2~f1~20120503.2-0ubuntu1) quantal; urgency=low
-
- * Initial release.
-
- -- Chuck Short <zulcss@ubuntu.com> Tue, 22 May 2012 09:57:46 -0400
+++ /dev/null
-/var/log/cinder/cinder-api.log {
- daily
- missingok
- compress
- delaycompress
- notifempty
-}
+++ /dev/null
-description "Cinder api server"
-author "Chuck Short <zulcss@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-chdir /var/run
-
-pre-start script
- mkdir -p /var/run/cinder
- chown cinder:cinder /var/run/cinder
-
- mkdir -p /var/lock/cinder
- chown cinder:root /var/lock/cinder
-end script
-
-exec start-stop-daemon --start --chuid cinder --exec /usr/bin/cinder-api \
- -- --config-file=/etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-api.log
+++ /dev/null
-description "Cinder backup server"
-author "Chuck Short <zulcss@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-chdir /var/run
-
-pre-start script
- mkdir -p /var/run/cinder
- chown cinder:cinder /var/run/cinder
-
- mkdir -p /var/lock/cinder
- chown cinder:root /var/lock/cinder
-end script
-
-exec start-stop-daemon --start --chuid cinder --exec /usr/bin/cinder-backup \
- -- --config-file=/etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-backup.log
+++ /dev/null
-/var/log/cinder/cinder-scheduler.log {
- daily
- missingok
- compress
- delaycompress
- notifempty
-}
+++ /dev/null
-description "Cinder scheduler server"
-author "Chuck Short <zulcss@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-chdir /var/run
-
-pre-start script
- mkdir -p /var/run/cinder
- chown cinder:cinder /var/run/cinder
-
- mkdir -p /var/lock/cinder
- chown cinder:root /var/lock/cinder
-end script
-
-exec start-stop-daemon --start --chuid cinder --exec /usr/bin/cinder-scheduler \
- -- --config-file=/etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-scheduler.log
+++ /dev/null
-/var/log/cinder/cinder-volume.log {
- daily
- missingok
- compress
- delaycompress
- notifempty
-}
+++ /dev/null
-description "Cinder volume server"
-author "Chuck Short <zulcss@ubuntu.com>"
-
-start on runlevel [2345]
-stop on runlevel [!2345]
-
-chdir /var/run
-
-pre-start script
- mkdir -p /var/run/cinder
- chown cinder:cinder /var/run/cinder
-
- mkdir -p /var/lock/cinder
- chown cinder:root /var/lock/cinder
-end script
-
-exec start-stop-daemon --start --chuid cinder --exec /usr/bin/cinder-volume \
- -- --config-file=/etc/cinder/cinder.conf --log-file=/var/log/cinder/cinder-volume.log
+++ /dev/null
-argparse python-argparse
-osprofiler python-osprofiler
-python_barbicanclient python-barbicanclient
-rtslib_fb python-rtslib-fb
+++ /dev/null
-version=3
-opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \
- https://launchpad.net/cinder/+download https://launchpad.net/cinder/.*/.*/.*/cinder-(.*)\.tar\.gz
--- /dev/null
+cinder (1:2015.1.0-1~u14.04+mos1) mos7.0; urgency=medium
+
+ * Update spec for Kilo
+ update dependencies according to global requirements [0]
+ [0] https://github.com/openstack/requirements/blob/stable/kilo/global-requirements.txt
+
+ -- Vasyl Saienko <vsaienko@mirantis.com> Mon, 27 Apr 2015 12:05:46 +0200
--- /dev/null
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: cinder-api
+# Required-Start: $network $local_fs $remote_fs $syslog
+# Required-Stop: $remote_fs
+# Should-Start: postgresql mysql keystone rabbitmq-server ntp
+# Should-Stop: postgresql mysql keystone rabbitmq-server ntp
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Cinder Api
+# Description: Provides EBS like storage for your
+# virtual machine instances
+### END INIT INFO
+
+# Author: Julien Danjou <acid@debian.org>, Thomas Goirand <zigo@debian.org>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="OpenStack Cinder Api"
+PROJECT_NAME=cinder
+NAME=${PROJECT_NAME}-api
--- /dev/null
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: cinder-backup
+# Required-Start: $network $local_fs $remote_fs $syslog
+# Required-Stop: $remote_fs
+# Should-Start: postgresql mysql keystone rabbitmq-server ntp
+# Should-Stop: postgresql mysql keystone rabbitmq-server ntp
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Cinder Backup
+# Description: Provides Cinder Backup
+### END INIT INFO
+
+# Author: Thomas Goirand <zigo@debian.org>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="OpenStack Cinder Backup"
+PROJECT_NAME=cinder
+NAME=${PROJECT_NAME}-backup
-/var/log/cinder/cinder-backup.log {
+/var/log/cinder/*.log {
daily
missingok
compress
delaycompress
+ copytruncate
notifempty
}
--- /dev/null
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: cinder-scheduler
+# Required-Start: $network $local_fs $remote_fs $syslog
+# Required-Stop: $remote_fs
+# Should-Start: postgresql mysql keystone rabbitmq-server ntp
+# Should-Stop: postgresql mysql keystone rabbitmq-server ntp
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Cinder Scheduler
+# Description: Provides EBS like storage for your
+# virtual machine instances
+### END INIT INFO
+
+# Author: Julien Danjou <acid@debian.org>, Thomas Goirand <zigo@debian.org>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="OpenStack Cinder Scheduler"
+PROJECT_NAME=cinder
+NAME=${PROJECT_NAME}-scheduler
--- /dev/null
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides: cinder-volume
+# Required-Start: $network $local_fs $remote_fs $syslog
+# Required-Stop: $remote_fs
+# Should-Start: postgresql mysql keystone rabbitmq-server ntp
+# Should-Stop: postgresql mysql keystone rabbitmq-server ntp
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Cinder Volume
+# Description: Provides EBS like storage for your
+# virtual machine instances
+### END INIT INFO
+
+# Author: Julien Danjou <acid@debian.org>
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="OpenStack Cinder Volume"
+PROJECT_NAME=cinder
+NAME=${PROJECT_NAME}-volume
Source: cinder
Section: net
Priority: extra
-Maintainer: Chuck Short <zulcss@ubuntu.com>
-Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6)
+Maintainer: MOS Cinder Team <mos-cinder@mirantis.com>
+Build-Depends:
+ debhelper (>= 9),
+ dh-systemd,
+ openstack-pkg-tools (>= 21),
+ python-all (>= 2.7.1)
Build-Depends-Indep:
python-anyjson (>= 0.3.3),
python-babel (>= 1.3),
- python-coverage,
- python-eventlet (>= 0.15.2),
+ python-barbicanclient (>= 3.0.1),
+ python-coverage (>= 3.6),
+ python-crypto (>= 2.6),
+ python-eventlet (>= 0.16.1),
python-fixtures (>= 0.3.14),
- python-glanceclient (>= 1:0.14.0 ),
+ python-glanceclient (>= 1:0.15.0),
python-greenlet (>= 0.3.2),
- python-hacking,
+ python-hacking (>= 0.10.0),
python-iso8601 (>= 0.1.9),
- python-keystoneclient (>= 1:0.10.0),
- python-keystonemiddleware (>= 1.0.0),
+ python-keystoneclient (>= 1:1.1.0),
+ python-keystonemiddleware (>= 1.5.0),
python-kombu (>= 2.5.0),
python-lxml (>= 2.3),
- python-migrate (>= 0.9.1), python-migrate (<< 0.9.2) | python-migrate (>> 0.9.2),
- python-mock,
- python-mox,
+ python-migrate (>= 0.9.5),
+ python-mock (>= 1.0),
+ python-mox (>= 0.5.3),
python-mysqldb,
python-netaddr (>= 0.7.12),
- python-novaclient (>= 1:2.18.0),
- python-oslo.config (>= 1:1.4.0),
- python-oslo.concurrency (>= 0.3.0),
- python-oslo.db (>= 1.0.0),
- python-oslo.rootwrap (>= 1.3.0),
- python-oslo.serialization (>= 1.0.0),
- python-oslo.utils (>= 1.0.0),
- python-oslo.messaging (>= 1.4.0), python-oslo.messaging (<< 1.5.0) | python-oslo.messaging (>> 1.5.0),
- python-oslosphinx,
+ python-novaclient (>= 1:2.22.0),
+ python-oslo-concurrency (>= 1.8.0),
+ python-oslo-config (>= 1:1.9.3),
+ python-oslo-context (>= 0.2.0),
+ python-oslo-db (>= 1.7.0),
+ python-oslo-i18n (>= 1.5.0),
+ python-oslo-log (>= 1.0.0),
+ python-oslo-messaging (>= 1.8.0),
+ python-oslo-middleware (>= 1.0.0),
+ python-oslo-rootwrap (>= 1.6.0),
+ python-oslo-serialization (>= 1.4.0),
+ python-oslo-utils (>= 1.4.0),
+ python-oslo-vmware (>= 0.11.1),
+ python-oslosphinx (>= 2.5.0),
+ python-oslotest (>= 1.5.1),
python-osprofiler (>= 0.3.0),
python-paramiko (>= 1.13.0),
python-paste,
python-pastedeploy (>= 1.5.0),
- python-crypto (>= 2.6),
- python-barbicanclient (>= 2.1.0), python-barbicanclient (<< 3.0.0) | python-barbicanclient (>> 3.0.0),
- python-requests (>= 2.2.0), python-requests (<< 2.4.0) | python-requests (>> 2.4.0),
- python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0),
- python-routes (>= 1.12.3), python-routes (<< 2.0) | python-routes (>> 2.0),
+ python-pbr (>= 0.10),
+ python-psycopg2,
+ python-pyparsing (>= 2.0.1),
+ python-requests (>= 2.2.0),
+ python-retrying (>= 1.2.3),
+ python-routes (>= 1.12.3),
python-setuptools,
- python-six (>= 1.7.0),
- python-sphinx,
- python-sqlalchemy (>= 0.9.7), python-sqlalchemy (<= 0.9.99),
- python-stevedore (>= 1.0.0),
+ python-six (>= 1.9.0),
+ python-sphinx (>= 1.1.2),
+ python-sqlalchemy (>= 0.9.7),
+ python-stevedore (>= 1.3.0),
+ python-subunit (>= 0.0.18),
python-suds (>= 0.4),
- python-swiftclient (>= 2.2.0),
- python-taskflow (>= 0.4),
- python-testtools (>= 0.9.32),
+ python-swiftclient (>= 1:2.2.0),
+ python-taskflow (>= 0.7.1),
+ python-tempest-lib (>= 0.4.0),
+ python-testresources (>= 0.2.4),
+ python-testtools (>= 0.9.36),
python-webob (>= 1.2.3),
- python-wsgiref (>= 0.1.2),
- python-oslo.i18n (>= 1.0.0),
- python-subunit (>=0.0.18),
testrepository (>= 0.0.18)
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
Homepage: http://launchpad.net/cinder
-Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/cinder/juno/files
-Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/cinder/juno
XS-Testsuite: autopkgtest
Package: python-cinder
Section: python
Architecture: all
Depends:
- python-pbr (>= 0.6), python-pbr (<< 0.7) | python-pbr (>> 0.7), python-pbr (<< 1.0),
python-amqplib (>= 0.6.1),
python-anyjson (>= 0.3.3),
- python-argparse,
python-babel (>= 1.3),
- python-eventlet (>= 0.15.2),
- python-glanceclient (>= 1:0.14.0 ),
- python-requests (>= 2.2.0), python-requests (<< 2.4.0) | python-requests (>> 2.4.0),
+ python-barbicanclient (>= 3.0.1),
+ python-crypto (>= 2.6),
+ python-eventlet (>= 0.16.1),
+ python-glanceclient (>= 1:0.15.0),
python-greenlet (>= 0.3.2),
- python-iso8601 (>= 0.1.9) ,
- python-keystoneclient (>= 1:0.10.0),
- python-keystonemiddleware (>= 1.0.0),
+ python-iso8601 (>= 0.1.9),
+ python-keystoneclient (>= 1:1.1.0),
+ python-keystonemiddleware (>= 1.5.0),
python-kombu (>= 2.5.0),
python-lockfile (>= 0.8),
python-lxml (>= 2.3),
- python-migrate (>= 0.9.1), python-migrate (<< 0.9.2) | python-migrate (>> 0.9.2),
+ python-migrate (>= 0.9.5),
python-netaddr (>= 0.7.12),
- python-novaclient (>= 1:2.18.0),
- python-oslo.config (>= 1:1.4.0),
- python-oslo.concurrency (>= 0.3.0),
- python-oslo.db (>= 1.0.0),
- python-oslo.messaging (>= 1.4.0), python-oslo.messaging (<< 1.5.0) | python-oslo.messaging (>> 1.5.0),
- python-oslo.rootwrap (>= 1.3.0),
- python-oslo.serialization (>= 1.0.0),
- python-oslo.utils (>= 1.0.0),
+ python-novaclient (>= 1:2.22.0),
+ python-oslo-concurrency (>= 1.8.0),
+ python-oslo-config (>= 1:1.9.3),
+ python-oslo-context (>= 0.2.0),
+ python-oslo-db (>= 1.7.0),
+ python-oslo-i18n (>= 1.5.0),
+ python-oslo-log (>= 1.0.0),
+ python-oslo-messaging (>= 1.8.0),
+ python-oslo-middleware (>= 1.0.0),
+ python-oslo-rootwrap (>= 1.6.0),
+ python-oslo-serialization (>= 1.4.0),
+ python-oslo-utils (>= 1.4.0),
+ python-oslo-vmware (>= 0.11.1),
python-osprofiler (>= 0.3.0),
python-paramiko (>= 1.13.0),
python-paste,
python-pastedeploy (>= 1.5.0),
- python-crypto (>= 2.6),
- python-barbicanclient (>= 2.1.0), python-barbicanclient (<< 3.0.0) | python-barbicanclient (>> 3.0.0),
- python-routes (>= 1.12.3), python-routes (<< 2.0) | python-routes (>> 2.0),
- python-six (>= 1.7.0),
- python-sqlalchemy (>= 0.9.7), python-sqlalchemy (<= 0.9.99),
- python-stevedore (>= 1.0.0),
+ python-pbr (>= 0.10),
+ python-pyparsing (>= 2.0.1),
+ python-requests (>= 2.2.0),
+ python-retrying (>= 1.2.3),
+ python-routes (>= 1.12.3),
+ python-six (>= 1.9.0),
+ python-sqlalchemy (>= 0.9.7),
+ python-stevedore (>= 1.3.0),
python-suds (>= 0.4),
- python-swiftclient (>= 2.2.0),
- python-taskflow (>= 0.4),
- python-rtslib-fb (>= 2.1.39),
+ python-swiftclient (>= 1:2.2.0),
+ python-taskflow (>= 0.7.1),
python-webob (>= 1.2.3),
- python-wsgiref (>= 0.1.2),
- python-oslo.i18n (>= 1.0.0),
- qemu-utils,
${misc:Depends},
${python:Depends}
-Suggests: python-ceph, python-hp3parclient
+Suggests: python-ceph, python-hp3parclient, python-rtslib-fb
Description: Cinder Python libraries
OpenStack is a reliable cloud infrastructure. Its mission is to produce
the ubiquitous cloud computing platform that will meet the needs of public
Package: cinder-api
Architecture: all
-Depends: cinder-common (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
+Depends:
+ cinder-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
Description: Cinder storage service - API server
OpenStack is a reliable cloud infrastructure. Its mission is to produce
the ubiquitous cloud computing platform that will meet the needs of public
Depends:
cinder-common (= ${binary:Version}),
lvm2,
+ qemu-utils,
tgt,
${misc:Depends},
${python:Depends}
Package: cinder-scheduler
Architecture: all
-Depends: cinder-common (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
+Depends:
+ cinder-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
Description: Cinder storage service - Scheduler server
OpenStack is a reliable cloud infrastructure. Its mission is to produce
the ubiquitous cloud computing platform that will meet the needs of public
Package: cinder-backup
Architecture: all
-Depends: cinder-common (= ${binary:Version}), ${misc:Depends}, ${python:Depends}
+Depends:
+ cinder-common (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends}
Description: Cinder storage service - Scheduler server
OpenStack is a reliable cloud infrastructure. Its mission is to produce
the ubiquitous cloud computing platform that will meet the needs of public
--- /dev/null
+--- a/cinder/tests/objects/test_objects.py
++++ b/cinder/tests/objects/test_objects.py
+@@ -438,7 +438,7 @@ class _TestObject(object):
+ class Foo(base.CinderObject):
+ fields = {'foobar': fields.Field(fields.Integer())}
+ obj = Foo()
+- with self.assertRaisesRegex(NotImplementedError, ".*foobar.*"):
++ with self.assertRaisesRegexp(NotImplementedError, ".*foobar.*"):
+ obj.foobar
+
+ def test_loaded_in_primitive(self):
--- /dev/null
+Description: Workaround problematic type casting in 15.04
+ ======================================================================
+ FAIL: cinder.tests.test_utils.GetBlkdevMajorMinorTestCase.test_get_blkdev_major_minor_file
+ cinder.tests.test_utils.GetBlkdevMajorMinorTestCase.test_get_blkdev_major_minor_file
+ ----------------------------------------------------------------------
+ _StringException: Traceback (most recent call last):
+ File "/build/buildd/cinder-2015.1~b3/cinder/tests/test_utils.py", line 721, in test_get_blkdev_major_minor_file
+ dev = self._test_get_blkdev_major_minor_file('/dev/made_up_disk1')
+ File "/usr/lib/python2.7/dist-packages/mock.py", line 1210, in patched
+ return func(*args, **keywargs)
+ File "/build/buildd/cinder-2015.1~b3/cinder/tests/test_utils.py", line 712, in _test_get_blkdev_major_minor_file
+ dev = utils.get_blkdev_major_minor(test_file)
+ File "/build/buildd/cinder-2015.1~b3/cinder/utils.py", line 656, in get_blkdev_major_minor
+ return get_blkdev_major_minor(devpath, False)
+ File "/build/buildd/cinder-2015.1~b3/cinder/utils.py", line 645, in get_blkdev_major_minor
+ return '%d:%d' % (os.major(st.st_rdev), os.minor(st.st_rdev))
+ SystemError: ../Objects/longobject.c:998: bad argument to internal function
+ Traceback (most recent call last):
+ _StringException: Empty attachments:
+ stderr
+ stdout
+Author: James Page <james.page@ubuntu.com>
+Forwarded: no
+
+--- a/cinder/utils.py
++++ b/cinder/utils.py
+@@ -643,7 +643,8 @@ def get_blkdev_major_minor(path, lookup_
+ st = os.stat(path)
+ if stat.S_ISBLK(st.st_mode):
+ path, st = _get_disk_of_partition(path, st)
+- return '%d:%d' % (os.major(st.st_rdev), os.minor(st.st_rdev))
++ return '%d:%d' % (os.major(long(st.st_rdev)),
++ os.minor(long(st.st_rdev)))
+ elif stat.S_ISCHR(st.st_mode):
+ # No I/O ratelimit control is provided for character devices
+ return None
--- /dev/null
+skip-rtslib-test.patch
+fix-long-casting.patch
+fix-assert-raises-regex-tests.patch
--- /dev/null
+--- a/cinder/tests/test_cmd.py
++++ b/cinder/tests/test_cmd.py
+@@ -16,13 +16,20 @@ import sys
+
+ import mock
+ from oslo_config import cfg
+-import rtslib
++try:
++ import rtslib
++except ImportError:
++ rtslib = None
++import testtools
+
+ from cinder.cmd import all as cinder_all
+ from cinder.cmd import api as cinder_api
+ from cinder.cmd import backup as cinder_backup
+ from cinder.cmd import manage as cinder_manage
+-from cinder.cmd import rtstool as cinder_rtstool
++try:
++ from cinder.cmd import rtstool as cinder_rtstool
++except ImportError:
++ cinder_rtstool = None
+ from cinder.cmd import scheduler as cinder_scheduler
+ from cinder.cmd import volume as cinder_volume
+ from cinder.cmd import volume_usage_audit
+@@ -685,6 +692,7 @@ class TestCinderManageCmd(test.TestCase)
+
+ class TestCinderRtstoolCmd(test.TestCase):
+
++ @testtools.skipIf(rtslib is None, "rtslib not found, skipping tests")
+ def setUp(self):
+ super(TestCinderRtstoolCmd, self).setUp()
+ sys.argv = ['cinder-rtstool']
--- /dev/null
+rtslib-fb
+oslo.context python-oslo-context
+oslo.concurrency python-oslo-concurrency
+oslo.config python-oslo-config
+oslo.messaging python-oslo-messaging
+oslo.vmware python-oslo-vmware
+oslo.utils python-oslo-utils
+oslo.serialization python-oslo-serialization
+oslo.db python-oslo-db
+oslo.i18n python-oslo-i18n
+oslo.utils python-oslo-utils
+oslo.rootwrap python-oslo-rootwrap
+oslo.log python-oslo-log
+oslo.middleware python-oslo-middleware
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/openstack-pkg-tools/pkgos.make
+
%:
- dh $@ --with python2
+ dh $@ --with python2,systemd
get-orig-source:
uscan --verbose --rename --destdir=../build-area
ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
override_dh_auto_test:
- ./run_tests.sh -N -P
+ rm -rf .testrepository
+ testr init && \
+ set -e && \
+ TEMP_REZ=`mktemp -t` && \
+ testr run --subunit | tee $$TEMP_REZ | subunit2pyunit; \
+ rm -f $$TEMP_REZ
endif
override_dh_install:
override_dh_clean:
# temporary workaround for d2to1 wonkyness
dh_clean -Xsetup.cfg
+ rm -f debian/*.init debian/*.service debian/*.upstart
Code Review / openstack-build / cinder-build.git / commitdiff