From: dtrishkin Date: Thu, 12 Mar 2015 17:23:11 +0000 (+0300) Subject: Update requirements for current tag X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5f25885322ef5a69cb7fba4166942f265ebd6e3b;p=openstack-build%2Fcinder-build.git Update requirements for current tag * Requirements have been updated according to https://github.com/openstack/cinder/blob/2014.2.2/requirements.txt and global requirements, because they are obsolete Change-Id: Iae06048171e33fa597745b00156e6e345442addb --- diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index 83164dea4..000000000 --- a/debian/README.Debian +++ /dev/null @@ -1,10 +0,0 @@ -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 diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 584a238fe..000000000 --- a/debian/changelog +++ /dev/null @@ -1,526 +0,0 @@ -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 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 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 Thu, 12 Jun 2014 10:35:06 -0400 - -cinder (1:2014.1-0ubuntu1) trusty; urgency=medium - - * New upstream release (LP: #1299055). - - -- Corey Bryant Wed, 16 Apr 2014 13:06:37 -0400 - -cinder (1:2014.1~rc3-0ubuntu1) trusty; urgency=medium - - * New release candidate (LP: #1299010). - - -- Chuck Short Tue, 15 Apr 2014 09:02:40 -0400 - -cinder (1:2014.1~rc2-0ubuntu1) trusty; urgency=medium - - * New upstream release (LP: #1299010). - - -- Chuck Short 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 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 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 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 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 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 Thu, 05 Dec 2013 21:30:40 -0500 - -cinder (1:2013.2-0ubuntu1) saucy; urgency=low - - * New upstream release (LP: #1236462). - - -- Chuck Short 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 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 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 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 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 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 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 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 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 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 Tue, 16 Apr 2013 14:38:46 -0700 - -cinder (1:2013.1-0ubuntu1) raring; urgency=low - - * New upstream release. - - -- Chuck Short Fri, 05 Apr 2013 07:53:23 -0500 - -cinder (1:2013.1~rc3-0ubuntu1) raring; urgency=low - - * New upstream release. - - -- Chuck Short 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 Fri, 10 Aug 2012 12:05:11 -0500 - -cinder (2012.2~f1~20120503.2-0ubuntu1) quantal; urgency=low - - * Initial release. - - -- Chuck Short Tue, 22 May 2012 09:57:46 -0400 diff --git a/debian/cinder-api.install b/debian/cinder-api.install deleted file mode 100644 index 98e58c1a9..000000000 --- a/debian/cinder-api.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/cinder-api diff --git a/debian/cinder-api.logrotate b/debian/cinder-api.logrotate deleted file mode 100644 index 31f3a7f04..000000000 --- a/debian/cinder-api.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/cinder/cinder-api.log { - daily - missingok - compress - delaycompress - notifempty -} diff --git a/debian/cinder-api.manpages b/debian/cinder-api.manpages deleted file mode 100644 index 0cc348b20..000000000 --- a/debian/cinder-api.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/cinder-api.8 diff --git a/debian/cinder-api.upstart b/debian/cinder-api.upstart deleted file mode 100644 index 2d6d07154..000000000 --- a/debian/cinder-api.upstart +++ /dev/null @@ -1,18 +0,0 @@ -description "Cinder api server" -author "Chuck Short " - -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 diff --git a/debian/cinder-backup.install b/debian/cinder-backup.install deleted file mode 100644 index b362ab5c5..000000000 --- a/debian/cinder-backup.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/cinder-backup diff --git a/debian/cinder-backup.logrotate b/debian/cinder-backup.logrotate deleted file mode 100644 index fd6419de8..000000000 --- a/debian/cinder-backup.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/cinder/cinder-backup.log { - daily - missingok - compress - delaycompress - notifempty -} diff --git a/debian/cinder-backup.upstart b/debian/cinder-backup.upstart deleted file mode 100644 index a95de6fe8..000000000 --- a/debian/cinder-backup.upstart +++ /dev/null @@ -1,18 +0,0 @@ -description "Cinder backup server" -author "Chuck Short " - -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 diff --git a/debian/cinder-common.dirs b/debian/cinder-common.dirs deleted file mode 100644 index f622135d1..000000000 --- a/debian/cinder-common.dirs +++ /dev/null @@ -1,5 +0,0 @@ -etc/cinder -etc/cinder/rootwrap.d -var/lib/cinder -var/log/cinder -var/lib/cinder/volumes diff --git a/debian/cinder-common.install b/debian/cinder-common.install deleted file mode 100644 index 0269adf17..000000000 --- a/debian/cinder-common.install +++ /dev/null @@ -1,9 +0,0 @@ -debian/cinder.conf etc/cinder -debian/cinder_sudoers etc/sudoers.d -debian/logging.conf etc/cinder -etc/cinder/api-paste.ini etc/cinder -etc/cinder/policy.json etc/cinder -etc/cinder/rootwrap.conf etc/cinder -usr/bin/cinder-manage -usr/bin/cinder-rootwrap -usr/bin/cinder-rtstool diff --git a/debian/cinder-common.manpages b/debian/cinder-common.manpages deleted file mode 100644 index 23a27ccfb..000000000 --- a/debian/cinder-common.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/man/cinder-manage.8 -debian/man/cinder-rootwrap.8 diff --git a/debian/cinder-common.postinst b/debian/cinder-common.postinst deleted file mode 100644 index 0c89129eb..000000000 --- a/debian/cinder-common.postinst +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -e - -if [ "$1" = "configure" ]; then - if ! getent group cinder > /dev/null 2>&1; then - addgroup --system cinder >/dev/null - fi - - if ! getent passwd cinder > /dev/null 2>&1; then - adduser --system --home /var/lib/cinder --ingroup cinder --no-create-home \ - --shell /bin/false cinder - fi - - chown -R cinder:adm /var/log/cinder - chmod 0750 /var/log/cinder - chown -R cinder:cinder /var/lib/cinder /etc/cinder - chmod 0750 /etc/cinder - chmod 0440 /etc/sudoers.d/cinder_sudoers - chown -R root:root /etc/cinder/rootwrap.d - chmod 0755 /etc/cinder/rootwrap.d - chown root:root /etc/cinder/rootwrap.conf - - if [ -e /var/lib/cinder/cinder.sqlite ]; then - chown cinder:cinder /var/lib/cinder/cinder.sqlite - chmod 0600 /var/lib/cinder/cinder.sqlite - fi -fi - -#DEBHELPER# diff --git a/debian/cinder-scheduler.install b/debian/cinder-scheduler.install deleted file mode 100644 index 8d994a17a..000000000 --- a/debian/cinder-scheduler.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/cinder-scheduler diff --git a/debian/cinder-scheduler.logrotate b/debian/cinder-scheduler.logrotate deleted file mode 100644 index 650adee4d..000000000 --- a/debian/cinder-scheduler.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/cinder/cinder-scheduler.log { - daily - missingok - compress - delaycompress - notifempty -} diff --git a/debian/cinder-scheduler.manpages b/debian/cinder-scheduler.manpages deleted file mode 100644 index 4d6e93c10..000000000 --- a/debian/cinder-scheduler.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/cinder-scheduler.8 diff --git a/debian/cinder-scheduler.upstart b/debian/cinder-scheduler.upstart deleted file mode 100644 index c321041e5..000000000 --- a/debian/cinder-scheduler.upstart +++ /dev/null @@ -1,18 +0,0 @@ -description "Cinder scheduler server" -author "Chuck Short " - -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 diff --git a/debian/cinder-volume-vmware.conf b/debian/cinder-volume-vmware.conf deleted file mode 100644 index 2e531c61a..000000000 --- a/debian/cinder-volume-vmware.conf +++ /dev/null @@ -1,21 +0,0 @@ -# vim: set ft=upstart et ts=2: -description "Cinder volume service for vmware" -author "Igor Gajsin igajsin@mirantis.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 - -script - [ -r /etc/default/$UPSTART_JOB ] &&. /etc/default/$UPSTART_JOB - start-stop-daemon --start --chuid cinder --exec /usr/bin/cinder-volume -- $CINDER_VOLUME_OPTS -end script diff --git a/debian/cinder-volume.dirs b/debian/cinder-volume.dirs deleted file mode 100644 index 2923f025c..000000000 --- a/debian/cinder-volume.dirs +++ /dev/null @@ -1,2 +0,0 @@ -var/lib/cinder/volumes -usr/share/cinder \ No newline at end of file diff --git a/debian/cinder-volume.install b/debian/cinder-volume.install deleted file mode 100644 index cbe16b457..000000000 --- a/debian/cinder-volume.install +++ /dev/null @@ -1,5 +0,0 @@ -debian/cinder_tgt.conf etc/tgt/conf.d -debian/cinder-volume-vmware.conf usr/share/cinder -etc/cinder/rootwrap.d/volume.filters /etc/cinder/rootwrap.d -usr/bin/cinder-volume -usr/bin/cinder-volume-usage-audit diff --git a/debian/cinder-volume.logrotate b/debian/cinder-volume.logrotate deleted file mode 100644 index 0215932ae..000000000 --- a/debian/cinder-volume.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/log/cinder/cinder-volume.log { - daily - missingok - compress - delaycompress - notifempty -} diff --git a/debian/cinder-volume.manpages b/debian/cinder-volume.manpages deleted file mode 100644 index 87e53e944..000000000 --- a/debian/cinder-volume.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/man/cinder-volume.8 diff --git a/debian/cinder-volume.postinst b/debian/cinder-volume.postinst deleted file mode 100644 index d9e3bcfe7..000000000 --- a/debian/cinder-volume.postinst +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -e - -if [ "$1" = "configure" ]; then - chown cinder:cinder /var/lib/cinder/volumes - chmod 0750 /var/lib/cinder/volumes - chown root:root /etc/cinder/rootwrap.d/volume.filters - - if which invoke-rc.d >/dev/null 2>&1; then - invoke-rc.d tgtd restart > /dev/null 2>&1 || true - else - /etc/init.d/tgtd restart > /dev/null 2>&1 || true - fi - - if which invoke-rc.d >/dev/null 2>&1; then - invoke-rc.d cinder-volume restart > /dev/null 2>&1 || true - else - /etc/init.d/cinder-volume restart > /dev/null 2>&1 || true - fi - -fi - -#DEBHELPER# diff --git a/debian/cinder-volume.upstart b/debian/cinder-volume.upstart deleted file mode 100644 index dd3295adf..000000000 --- a/debian/cinder-volume.upstart +++ /dev/null @@ -1,18 +0,0 @@ -description "Cinder volume server" -author "Chuck Short " - -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 diff --git a/debian/cinder.conf b/debian/cinder.conf deleted file mode 100644 index 709403356..000000000 --- a/debian/cinder.conf +++ /dev/null @@ -1,11 +0,0 @@ -[DEFAULT] -rootwrap_config = /etc/cinder/rootwrap.conf -api_paste_confg = /etc/cinder/api-paste.ini -iscsi_helper = tgtadm -volume_name_template = volume-%s -volume_group = cinder-volumes -verbose = True -auth_strategy = keystone -state_path = /var/lib/cinder -lock_path = /var/lock/cinder -volumes_dir = /var/lib/cinder/volumes diff --git a/debian/cinder_sudoers b/debian/cinder_sudoers deleted file mode 100644 index 470a1f47a..000000000 --- a/debian/cinder_sudoers +++ /dev/null @@ -1,3 +0,0 @@ -Defaults:cinder !requiretty - -cinder ALL = (root) NOPASSWD: /usr/bin/cinder-rootwrap /etc/cinder/rootwrap.conf * diff --git a/debian/cinder_tgt.conf b/debian/cinder_tgt.conf deleted file mode 100644 index 444eb00e4..000000000 --- a/debian/cinder_tgt.conf +++ /dev/null @@ -1 +0,0 @@ -include /var/lib/cinder/volumes/* diff --git a/debian/clean b/debian/clean deleted file mode 100644 index e932b028c..000000000 --- a/debian/clean +++ /dev/null @@ -1 +0,0 @@ -setup.cfg diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 45a4fb75d..000000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -8 diff --git a/debian/control b/debian/control deleted file mode 100644 index a16fba5c2..000000000 --- a/debian/control +++ /dev/null @@ -1,185 +0,0 @@ -Source: cinder -Section: net -Priority: extra -Maintainer: Chuck Short -Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6) -Build-Depends-Indep: - python-anyjson (>= 0.3.3), - python-babel (>= 1.3), - python-coverage, - python-eventlet (>= 0.15.1), - python-fixtures (>= 0.3.14), - python-glanceclient (>= 1:0.14.0 ), - python-greenlet (>= 0.3.2), - python-hacking, - python-iso8601 (>= 0.1.9), - python-keystonemiddleware (>= 1.0.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-mysqldb, - python-netaddr (>= 0.7.12), - python-novaclient (>= 2.18.0), - python-oslo.config (>= 1:1.4.0), - python-oslo.db (>= 1.0.0), - python-oslo.rootwrap (>= 1.3.0), - python-oslo.messaging (>= 1.4.0), - python-oslosphinx, - python-paramiko (>= 1.13.0), - python-paste, - python-pastedeploy (>= 1.5.0), - python-requests (>= 1.2.1), 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-setuptools, - python-six (>= 1.7.0), - python-sphinx, - python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<= 0.8.99) | python-sqlalchemy (>= 0.9.7), python-sqlalchemy (<= 0.9.99), - python-stevedore (>= 1.0.0), - python-suds (>= 0.4), - python-swiftclient (>= 2.2.0), - python-taskflow (>= 0.4), - python-testtools (>= 0.9.32), - python-webob (>= 1.2.3), - python-subunit (>=0.0.18), - testrepository (>= 0.0.18) -Standards-Version: 3.9.4 -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.1), - python-glanceclient (>= 1:0.14.0 ), - python-requests (>= 1.2.1), python-requests (<< 2.4.0) | python-requests (>> 2.4.0), - python-greenlet (>= 0.3.2), - python-iso8601 (>= 0.1.9) , - python-keystonemiddleware (>= 1.0.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-netaddr (>= 0.7.12), - python-novaclient (>= 1:2.18.0), - python-oslo.config (>= 1:1.4.0), - python-oslo.db (>= 1.0.0), - python-oslo.messaging (>= 1.4.0), - python-oslo.rootwrap (>= 1.3.0), - 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-routes (>= 1.12.3), python-routes (<< 2.0) | python-routes (>> 2.0), - python-six (>= 1.7.0), - python-sqlalchemy (>= 0.8.4), python-sqlalchemy (<= 0.8.99) | python-sqlalchemy (>= 0.9.7), python-sqlalchemy (<= 0.9.99), - python-stevedore (>= 1.0.0), - python-suds (>= 0.4), - python-swiftclient (>= 2.2.0), - python-taskflow (>= 0.4), - python-rtslib-fb (>= 2.1.39), - python-webob (>= 1.2.3), - python-wsgiref (>= 0.1.2), - qemu-utils, - ${misc:Depends}, - ${python:Depends} -Suggests: python-ceph, python-hp3parclient -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 - and private cloud providers regardless of size, by being simple to implement - and massively scalable. - . - Cinder is the OpenStack Block storage service. - . - This package contains the Python library for Cinder. - -Package: cinder-common -Architecture: all -Depends: - adduser, - python-cinder (= ${binary:Version}), - ${misc:Depends}, - ${python:Depends} -Provides: ${python:Provides} -Description: Cinder storage service - common files - OpenStack is a reliable cloud infrastructure. Its mission is to produce - the ubiquitous cloud computing platform that will meet the needs of public - and private cloud providers regardless of size, by being simple to implement - and massively scalable. - . - Cinder is the OpenStack Block storage service. - . - This package contains commons components for Cinder. - -Package: cinder-api -Architecture: all -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 - and private cloud providers regardless of size, by being simple to implement - and massively scalable. - . - Cinder is the OpenStack Block storage service. - . - This package contains the Cinder API server. - -Package: cinder-volume -Architecture: all -Depends: - cinder-common (= ${binary:Version}), - lvm2, - tgt, - cryptsetup, - ${misc:Depends}, - ${python:Depends} -Breaks: cinder-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ) -Replaces: cinder-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 ) -Description: Cinder storage service - Volume server - OpenStack is a reliable cloud infrastructure. Its mission is to produce - the ubiquitous cloud computing platform that will meet the needs of public - and private cloud providers regardless of size, by being simple to implement - and massively scalable. - . - Cinder is the OpenStack Block storage service. - . - This package contains the Cinder Volume server. - -Package: cinder-scheduler -Architecture: all -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 - and private cloud providers regardless of size, by being simple to implement - and massively scalable. - . - Cinder is the OpenStack Block storage service. - . - This package contains the Cinder Scheduler server. - -Package: cinder-backup -Architecture: all -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 - and private cloud providers regardless of size, by being simple to implement - and massively scalable. - . - Cinder is the OpenStack Block storage service. - . - This package contains the Cinder backup service. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 9d7959a8d..000000000 --- a/debian/copyright +++ /dev/null @@ -1,25 +0,0 @@ -Format: http://dep.debian.net/deps/dep5- -Upstream-Name: nova -Source: https://code.launchpad.net/nova - -Files: * -Copyright: 2010 United States Government as represented - by the Administrator of the National Aeronautics - and Space Administration. -Copyright: 2010 OpenStack LLC -Copyright: Others (See individual files for more details) -License: Apache-2 - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - . - http://www.apache.org/licenses/LICENSE-2.0 - . - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - . - On Debian-based systems the full text of the Apache version 2.0 license - can be found in `/usr/share/common-licenses/Apache-2.0'. diff --git a/debian/docs b/debian/docs deleted file mode 100644 index a1320b1b4..000000000 --- a/debian/docs +++ /dev/null @@ -1 +0,0 @@ -README.rst diff --git a/debian/logging.conf b/debian/logging.conf deleted file mode 100644 index 476425b8b..000000000 --- a/debian/logging.conf +++ /dev/null @@ -1,76 +0,0 @@ -[loggers] -keys = root, cinder - -[handlers] -keys = stderr, stdout, watchedfile, syslog, null - -[formatters] -keys = legacycinder, default - -[logger_root] -level = WARNING -handlers = null - -[logger_cinder] -level = INFO -handlers = stderr -qualname = cinder - -[logger_amqplib] -level = WARNING -handlers = stderr -qualname = amqplib - -[logger_sqlalchemy] -level = WARNING -handlers = stderr -qualname = sqlalchemy -# "level = INFO" logs SQL queries. -# "level = DEBUG" logs SQL queries and results. -# "level = WARNING" logs neither. (Recommended for production systems.) - -[logger_boto] -level = WARNING -handlers = stderr -qualname = boto - -[logger_suds] -level = INFO -handlers = stderr -qualname = suds - -[logger_eventletwsgi] -level = WARNING -handlers = stderr -qualname = eventlet.wsgi.server - -[handler_stderr] -class = StreamHandler -args = (sys.stderr,) -formatter = legacycinder - -[handler_stdout] -class = StreamHandler -args = (sys.stdout,) -formatter = legacycinder - -[handler_watchedfile] -class = handlers.WatchedFileHandler -args = ('cinder.log',) -formatter = legacycinder - -[handler_syslog] -class = handlers.SysLogHandler -args = ('/dev/log', handlers.SysLogHandler.LOG_USER) -formatter = legacycinder - -[handler_null] -class = cinder.log.NullHandler -formatter = default -args = () - -[formatter_legacycinder] -class = cinder.log.LegacyCinderFormatter - -[formatter_default] -format = %(message)s diff --git a/debian/man/cinder-api.8 b/debian/man/cinder-api.8 deleted file mode 100644 index e3f870e14..000000000 --- a/debian/man/cinder-api.8 +++ /dev/null @@ -1,20 +0,0 @@ -.TH cinder\-api 8 -.SH NAME -cinder\-api \- frontend API server for cinder - -.SH SYNOPSIS -.B cinder\-api -.B \-\-config-file= - -.SH DESCRIPTION -.B cinder\-api - -This man page is a stub. Please contribute. - -.SH PARAMETERS - -.LP -.B \-\-config-file= -.IP - -Path to the file containing options. diff --git a/debian/man/cinder-manage.8 b/debian/man/cinder-manage.8 deleted file mode 100644 index 687bb7b84..000000000 --- a/debian/man/cinder-manage.8 +++ /dev/null @@ -1,21 +0,0 @@ -.TH cinder\-manage 8 -.SH NAME -cinder\-manage \- manages the cinder daemons - -.SH SYNOPSIS -.B cinder\-manage -.B - -.SH DESCRIPTION -.B cinder\-manage - -This man page is a stub. Please contribute. - -.SH PARAMETERS - -.LP -.B -.IP - -cinder-manage.8 (END) - diff --git a/debian/man/cinder-rootwrap.8 b/debian/man/cinder-rootwrap.8 deleted file mode 100644 index 94d7f293c..000000000 --- a/debian/man/cinder-rootwrap.8 +++ /dev/null @@ -1,22 +0,0 @@ -.TH cinder\-rootwrap 8 -.SH NAME -cinder\-rootwrap \- Authorizes and executes sudo commands on cinder's behalf - -.SH SYNOPSIS -.B cinder\-rootwrap -.B - -.SH DESCRIPTION -.B cinder\-rootwrap - -This man page is a stub. Please contribute. - -.SH PARAMETERS - -.LP -.B -.IP - -Command to be executed with sudo -cinder-rootwrap.8 (END) - diff --git a/debian/man/cinder-scheduler.8 b/debian/man/cinder-scheduler.8 deleted file mode 100644 index e3f870e14..000000000 --- a/debian/man/cinder-scheduler.8 +++ /dev/null @@ -1,20 +0,0 @@ -.TH cinder\-api 8 -.SH NAME -cinder\-api \- frontend API server for cinder - -.SH SYNOPSIS -.B cinder\-api -.B \-\-config-file= - -.SH DESCRIPTION -.B cinder\-api - -This man page is a stub. Please contribute. - -.SH PARAMETERS - -.LP -.B \-\-config-file= -.IP - -Path to the file containing options. diff --git a/debian/man/cinder-volume.8 b/debian/man/cinder-volume.8 deleted file mode 100644 index e3f870e14..000000000 --- a/debian/man/cinder-volume.8 +++ /dev/null @@ -1,20 +0,0 @@ -.TH cinder\-api 8 -.SH NAME -cinder\-api \- frontend API server for cinder - -.SH SYNOPSIS -.B cinder\-api -.B \-\-config-file= - -.SH DESCRIPTION -.B cinder\-api - -This man page is a stub. Please contribute. - -.SH PARAMETERS - -.LP -.B \-\-config-file= -.IP - -Path to the file containing options. diff --git a/debian/pydist-overrides b/debian/pydist-overrides deleted file mode 100644 index b4662c7fc..000000000 --- a/debian/pydist-overrides +++ /dev/null @@ -1,4 +0,0 @@ -argparse python-argparse -osprofiler python-osprofiler -python_barbicanclient python-barbicanclient -rtslib_fb python-rtslib-fb diff --git a/debian/python-cinder.install b/debian/python-cinder.install deleted file mode 100644 index 036c6b9db..000000000 --- a/debian/python-cinder.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/python*/dist-packages/* diff --git a/debian/rules b/debian/rules deleted file mode 100755 index f38a7dc14..000000000 --- a/debian/rules +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/make -f - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -%: - dh $@ --with python2 - -get-orig-source: - uscan --verbose --rename --destdir=../build-area - -ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) -override_dh_auto_test: - ./run_tests.sh -N -P -endif - -override_dh_install: - dh_install --fail-missing -Xbin/cinder-all - -override_dh_fixperms: - dh_fixperms -Xcinder_tgt.conf - -override_dh_clean: - # temporary workaround for d2to1 wonkyness - dh_clean -Xsetup.cfg diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8d8..000000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian/tests/cinder-daemons b/debian/tests/cinder-daemons deleted file mode 100755 index 3e25e52a0..000000000 --- a/debian/tests/cinder-daemons +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -#----------------------- -# Testing cinder-daemons -#----------------------- -set -e -DAEMONS=('cinder-api' 'cinder-scheduler') - -for daemon in "${DAEMONS[@]}"; do - if pidof -x $daemon > /dev/null; then - echo "OK" - else - echo "ERROR: ${daemon} IS NOT RUNNING" - exit 1 - fi -done diff --git a/debian/tests/cinder-volume b/debian/tests/cinder-volume deleted file mode 100755 index aa235d901..000000000 --- a/debian/tests/cinder-volume +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -#---------------------- -# Testing cinder-volume -#---------------------- -set -e -apt-get install -y cinder-volume cinder-backup 2>&1 > /dev/null -DAEMONS=('cinder-volume' 'cinder-backup') - -for daemon in "${DAEMONS[@]}"; do - if pidof -x $daemon > /dev/null; then - echo "OK" - else - echo "ERROR: ${daemon} IS NOT RUNNING" - exit 1 - fi -done -apt-get remove -y cinder-volume cinder-backup 2>&1 > /dev/null diff --git a/debian/tests/control b/debian/tests/control deleted file mode 100644 index d68943b70..000000000 --- a/debian/tests/control +++ /dev/null @@ -1,3 +0,0 @@ -Tests: python-cinder cinder-daemons cinder-volume -Depends: python-cinder, cinder-api, cinder-scheduler, lvm2 -Restrictions: needs-root diff --git a/debian/tests/python-cinder b/debian/tests/python-cinder deleted file mode 100755 index cc9cff092..000000000 --- a/debian/tests/python-cinder +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -#------------------------- -# Testing client utilities -#------------------------- -set -e - -result=$(python `dirname $0`/test_import_cinder.py 2>&1) -if [ "$result" ]; then - echo "ERROR: PYTHON-CINDER MODULE CANNOT BE IMPORTED" - exit 1 -else - echo "OK" - exit 0 -fi diff --git a/debian/tests/test_import_cinder.py b/debian/tests/test_import_cinder.py deleted file mode 100644 index 720920529..000000000 --- a/debian/tests/test_import_cinder.py +++ /dev/null @@ -1,4 +0,0 @@ -try: - import cinder -except ImportError, e: - print "ERROR IMPORTING MODULE" diff --git a/debian/watch b/debian/watch deleted file mode 100644 index a0f52c86a..000000000 --- a/debian/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \ - https://launchpad.net/cinder/+download https://launchpad.net/cinder/.*/.*/.*/cinder-(.*)\.tar\.gz diff --git a/rpm/SPECS/openstack-cinder.spec b/rpm/SPECS/openstack-cinder.spec index bb88e641e..94c3d844d 100644 --- a/rpm/SPECS/openstack-cinder.spec +++ b/rpm/SPECS/openstack-cinder.spec @@ -1,7 +1,7 @@ %global with_doc %{!?_without_doc:1}%{?_without_doc:0} Name: openstack-cinder -Version: 2014.2 +Version: 2014.2.2 Release: 2%{?dist} Summary: OpenStack Volume service @@ -69,41 +69,41 @@ Requires: python-paramiko >= 1.13.0 Requires: python-paste Requires: python-qpid -Requires: python-kombu >= 2.5.0 +Requires: python-kombu >= 3.0.7 + Requires: python-amqplib -Requires: python-pbr >= 0.6.0, python-pbr < 0.7.0, python-pbr > 0.7.0, python-pbr < 1.0 +Requires: python-pbr >= 0.6, python-pbr < 0.7, python-pbr > 0.7, python-pbr < 1.0 Requires: python-eventlet >= 0.15.1 Requires: python-greenlet >= 0.3.2 Requires: python-iso8601 >= 0.1.9 Requires: python-lxml >= 2.3 Requires: python-netaddr >= 0.7.12 Requires: python-oslo-config >= 1:1.4.0 -Requires: python-oslo-db >= 1.0.0 -Requires: python-oslo-messaging >= 1.4.0 +Requires: python-oslo-db >= 1.0.0, python-oslo-db < 1.1 +Requires: python-oslo-messaging >= 1.4.0, python-oslo-messaging < 1.5.0 Requires: python-oslo-rootwrap >= 1.3.0 Requires: python-osprofiler >= 0.3.0 Requires: python-anyjson >= 0.3.3 Requires: python-argparse #Requires: python-cheetah Requires: python-stevedore >= 1.0.0 -Requires: python-suds >= 0.4 - -Requires: python-sqlalchemy >= 0.8.4, python-sqlalchemy <= 0.8.99, python-sqlalchemy >= 0.9.7, python-sqlalchemy <= 0.9.99 -Requires: python-migrate >= 0.9.1, python-migrate < 0.9.2, python-migrate > 0.9.2 +Requires: python-suds >= 0.4, python-suds <= 0.4.1 +Requires: python-sqlalchemy >= 0.9.7, python-sqlalchemy <= 0.9.99 +Requires: python-migrate == 0.9.1 +Requires: python-barbicanclient >= 2.1.0, python-barbicanclient < 3.0.0, python-barbicanclient > 3.0.0, python-barbicanclient < 3.0.2 Requires: python-paste-deploy >= 1.5.0 Requires: python-crypto >= 2.6 -Requires: python-barbicanclient >= 2.1.0 Requires: python-glanceclient >= 1:0.14.0 -Requires: python-routes >= 1.12.3, python-routes < 2.0, python-routes > 2.0 +Requires: python-routes >= 1.12.3 Requires: python-webob >= 1.2.3 Requires: python-wsgiref >= 0.1.2 Requires: python-oslo-i18n >= 1.0.0 Requires: python-swiftclient >= 2.2.0 -Requires: python-requests >= 1.2.1, python-requests < 2.4.0, python-requests > 2.4.0 -Requires: python-keystonemiddleware >= 1.0.0 +Requires: python-requests >= 2.1.0, python-requests <= 2.2.1 +Requires: python-keystonemiddleware >= 1.0.0, python-keystonemiddleware < 1.4.0 Requires: python-novaclient >= 1:2.18.0 Requires: python-six >= 1.7.0 @@ -112,7 +112,7 @@ Requires: python-babel >= 1.3 Requires: python-lockfile Requires: python-rtslib-fb >= 2.1.fb39 -Requires: python-taskflow >= 0.4 +Requires: python-taskflow >= 0.4, python-taskflow < 0.7.0 Requires: python-ceph #Requires: iscsi-initiator-utils @@ -300,6 +300,9 @@ fi %endif %changelog +* Fri Mar 06 2015 Daniil Trishkin - 2014.2.2 +- Update to upstream 2014.2.2 + * Wed Jun 11 2014 Eric Harney - 2014.1.1-2 - Add dependency on iscsi-initiator-utils diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 21910d639..79a786701 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,3 +1,11 @@ +cinder (1:2014.2.2-fuel6.1+14.04+2) trusty; urgency=medium + + * Update dependencies for current tag + * trusty/debian/control: + - Add python-oslo.i18n to Depends + + -- Daniil Trishkin Thu, 12 Mar 2015 20:22:42 +0300 + cinder (1:2014.2.2-fuel6.1+14.04+1) trusty; urgency=medium * Build cinder 2014.2.2 packages for Ubuntu 14.04 diff --git a/trusty/debian/control b/trusty/debian/control index 0e3227d30..63b80b05a 100644 --- a/trusty/debian/control +++ b/trusty/debian/control @@ -2,14 +2,14 @@ Source: cinder Section: net Priority: extra Maintainer: MOS Cinder Team -Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.7.1) +Build-Depends: debhelper (>= 9), python-all (>= 2.7.1) Build-Depends-Indep: python-anyjson (>= 0.3.3), python-babel (>= 1.3), python-coverage, python-eventlet (>= 0.15.1), python-fixtures (>= 0.3.14), - python-glanceclient (>= 1:0.14.0 ), + python-glanceclient (>= 1:0.14.0), python-greenlet (>= 0.3.2), python-hacking, python-iso8601 (>= 0.1.9), @@ -21,7 +21,7 @@ Build-Depends-Indep: python-mox, python-mysqldb, python-netaddr (>= 0.7.12), - python-novaclient (>= 2.18.0), + python-novaclient (>= 1:2.18.0), python-oslo.config (>= 1:1.4.0), python-oslo.db (>= 1.0.0), python-oslo.rootwrap (>= 1.3.0), @@ -30,7 +30,7 @@ Build-Depends-Indep: python-paramiko (>= 1.13.0), python-paste, python-pastedeploy (>= 1.5.0), - python-requests (>= 1.2.1), + python-requests (>= 2.1.0), python-pbr (>= 0.10), python-routes (>= 1.12.3), python-setuptools, @@ -43,7 +43,7 @@ Build-Depends-Indep: python-taskflow (>= 0.4), python-testtools (>= 0.9.32), python-webob (>= 1.2.3), - python-subunit (>=0.0.18), + python-subunit (>= 0.0.18), testrepository (>= 0.0.18) Standards-Version: 3.9.4 @@ -57,7 +57,7 @@ Depends: python-babel (>= 1.3), python-eventlet (>= 0.15.1), python-glanceclient (>= 1:0.14.0), - python-requests (>= 1.2.1), + python-requests (>= 2.1.0), python-greenlet (>= 0.3.2), python-iso8601 (>= 0.1.9) , python-keystonemiddleware (>= 1.0.0), @@ -87,6 +87,7 @@ Depends: python-rtslib-fb (>= 2.1.39), python-webob (>= 1.2.3), qemu-utils, + python-oslo.i18n (>= 1.0.0), ${misc:Depends}, ${python:Depends} Suggests: python-ceph, python-hp3parclient diff --git a/trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch b/trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch index 001adc040..11a60c6f3 100644 --- a/trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch +++ b/trusty/debian/patches/0001-requirements.txt-adjust-for-Ubuntu-14.04.patch @@ -1,6 +1,6 @@ -From 11f9508af0e10cb59f36e72ba448c94fbb9a0a2d Mon Sep 17 00:00:00 2001 -From: Alexei Sheplyakov -Date: Tue, 24 Feb 2015 22:20:19 +0300 +From e88ed514f7e503e8b8c985c88fa33569f5bd8c30 Mon Sep 17 00:00:00 2001 +From: Sergey Kolekonov +Date: Sun, 15 Mar 2015 23:09:42 +0300 Subject: [PATCH] requirements.txt: adjust for Ubuntu 14.04 * argparse and wsgiref are parts of the standard library in python 2.7 @@ -11,32 +11,32 @@ Subject: [PATCH] requirements.txt: adjust for Ubuntu 14.04 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt -index dac0a92..fc6ecc3 100644 +index 0e29079..5ea45eb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,6 @@ pbr>=0.6,!=0.7,<1.0 - anyjson>=0.3.3 + anyjson>=0.3.3,<=0.3.3 -argparse - Babel>=1.3 - eventlet>=0.15.1,<0.16.0 - greenlet>=0.3.2 -@@ -27,7 +26,7 @@ python-glanceclient>=0.14.0 - python-novaclient>=2.18.0 - python-swiftclient>=2.2.0 - requests>=1.2.1,!=2.4.0 --Routes>=1.12.3,!=2.0 -+Routes>=1.12.3, - taskflow>=0.4 - rtslib-fb>=2.1.39 - six>=1.7.0 + Babel>=1.3,<=1.3 + eventlet>=0.15.1,<=0.15.2 + greenlet>=0.3.2,<=0.4.2 +@@ -27,7 +26,7 @@ python-glanceclient>=0.14.0,<=0.15.0 + python-novaclient>=2.18.0,<=2.20.0 + python-swiftclient>=2.2.0,<=2.3.1 + requests>=1.2.1,!=2.4.0,<=2.2.1 +-Routes>=1.12.3,!=2.0,<=2.1 ++Routes>=1.12.3 + taskflow>=0.4,<0.7.0 + rtslib-fb>=2.1.39,<=2.1.51 + six>=1.7.0,<=1.9.0 @@ -36,5 +35,4 @@ sqlalchemy-migrate==0.9.1 - stevedore>=1.0.0 # Apache-2.0 + stevedore>=1.0.0,<=1.2.0 # Apache-2.0 suds>=0.4 - WebOb>=1.2.3 + WebOb>=1.2.3,<=1.3.1 -wsgiref>=0.1.2 - oslo.i18n>=1.0.0 # Apache-2.0 + oslo.i18n>=1.0.0,<=1.3.1 # Apache-2.0 -- -1.9.1 +1.9.5 (Apple Git-50.3)