From ff849c66f8dbd7ba779b4b87b0da3d3aff8be904 Mon Sep 17 00:00:00 2001 From: Ivan Udovichenko Date: Wed, 1 Feb 2017 18:56:31 +0200 Subject: [PATCH] Auto rebuild for xenial-mitaka Cinder component from 9.0/mitaka Trusty. https://mirantis.jira.com/browse/PROD-9094 Change-Id: I7310e405bf69594a903041f96c06a07667e277e4 --- xenial/debian/README.Debian | 10 + xenial/debian/changelog | 643 ++++++++++++++++++ xenial/debian/cinder-api.init.in | 18 + xenial/debian/cinder-api.install | 1 + xenial/debian/cinder-api.manpages | 1 + xenial/debian/cinder-backup.init.in | 17 + xenial/debian/cinder-backup.install | 1 + xenial/debian/cinder-common.dirs | 1 + xenial/debian/cinder-common.install | 7 + xenial/debian/cinder-common.logrotate | 8 + xenial/debian/cinder-common.manpages | 2 + xenial/debian/cinder-common.postinst.in | 27 + xenial/debian/cinder-common.postrm | 14 + xenial/debian/cinder-common.sudoers | 3 + xenial/debian/cinder-common.tmpfile | 1 + xenial/debian/cinder-doc.doc-base | 9 + xenial/debian/cinder-scheduler.init.in | 18 + xenial/debian/cinder-scheduler.install | 1 + xenial/debian/cinder-scheduler.manpages | 1 + xenial/debian/cinder-volume.init.in | 18 + xenial/debian/cinder-volume.install | 4 + xenial/debian/cinder-volume.manpages | 1 + xenial/debian/cinder-volume.postinst.in | 21 + xenial/debian/cinder_tgt.conf | 1 + xenial/debian/compat | 1 + xenial/debian/control | 290 ++++++++ xenial/debian/copyright | 25 + xenial/debian/debian_control_vars | 1 + xenial/debian/gbp.conf | 8 + xenial/debian/man/cinder-api.8 | 20 + xenial/debian/man/cinder-manage.8 | 21 + xenial/debian/man/cinder-rootwrap.8 | 22 + xenial/debian/man/cinder-scheduler.8 | 20 + xenial/debian/man/cinder-volume.8 | 20 + ...uration_opts_from_cinder.sample.conf.patch | 276 ++++++++ xenial/debian/patches/series | 0 xenial/debian/pydist-overrides | 1 + xenial/debian/python-cinder.install | 1 + xenial/debian/rules | 102 +++ xenial/debian/source/format | 1 + xenial/debian/watch | 3 + 41 files changed, 1640 insertions(+) create mode 100644 xenial/debian/README.Debian create mode 100644 xenial/debian/changelog create mode 100644 xenial/debian/cinder-api.init.in create mode 100644 xenial/debian/cinder-api.install create mode 100644 xenial/debian/cinder-api.manpages create mode 100644 xenial/debian/cinder-backup.init.in create mode 100644 xenial/debian/cinder-backup.install create mode 100644 xenial/debian/cinder-common.dirs create mode 100644 xenial/debian/cinder-common.install create mode 100644 xenial/debian/cinder-common.logrotate create mode 100644 xenial/debian/cinder-common.manpages create mode 100644 xenial/debian/cinder-common.postinst.in create mode 100644 xenial/debian/cinder-common.postrm create mode 100644 xenial/debian/cinder-common.sudoers create mode 100644 xenial/debian/cinder-common.tmpfile create mode 100644 xenial/debian/cinder-doc.doc-base create mode 100644 xenial/debian/cinder-scheduler.init.in create mode 100644 xenial/debian/cinder-scheduler.install create mode 100644 xenial/debian/cinder-scheduler.manpages create mode 100644 xenial/debian/cinder-volume.init.in create mode 100644 xenial/debian/cinder-volume.install create mode 100644 xenial/debian/cinder-volume.manpages create mode 100644 xenial/debian/cinder-volume.postinst.in create mode 100644 xenial/debian/cinder_tgt.conf create mode 100644 xenial/debian/compat create mode 100644 xenial/debian/control create mode 100644 xenial/debian/copyright create mode 100644 xenial/debian/debian_control_vars create mode 100644 xenial/debian/gbp.conf create mode 100644 xenial/debian/man/cinder-api.8 create mode 100644 xenial/debian/man/cinder-manage.8 create mode 100644 xenial/debian/man/cinder-rootwrap.8 create mode 100644 xenial/debian/man/cinder-scheduler.8 create mode 100644 xenial/debian/man/cinder-volume.8 create mode 100644 xenial/debian/patches/Missing_configuration_opts_from_cinder.sample.conf.patch create mode 100644 xenial/debian/patches/series create mode 100644 xenial/debian/pydist-overrides create mode 100644 xenial/debian/python-cinder.install create mode 100755 xenial/debian/rules create mode 100644 xenial/debian/source/format create mode 100644 xenial/debian/watch diff --git a/xenial/debian/README.Debian b/xenial/debian/README.Debian new file mode 100644 index 000000000..0a7d689f3 --- /dev/null +++ b/xenial/debian/README.Debian @@ -0,0 +1,10 @@ +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/xenial/debian/changelog b/xenial/debian/changelog new file mode 100644 index 000000000..c5ff55c43 --- /dev/null +++ b/xenial/debian/changelog @@ -0,0 +1,643 @@ +cinder (2:8.0.0-7~u16.04+mos0) mos; urgency=medium + + * Auto rebuild for xenial-mitaka + + -- Ivan Udovichenko Wed, 01 Feb 2017 18:55:40 +0200 + +cinder (2:8.0.0-7~u14.04+mos0) mos9.0; urgency=medium + + * Remove interactive mode (debconf). + + -- Ivan Udovichenko Wed, 01 Feb 2017 18:38:39 +0200 + +cinder (2:8.0.0-6~u14.04+mos0) mos9.0; urgency=medium + + * Rebuild with new version of openstack-pkg-tools package. + + -- Ivan Udovichenko Sat, 20 Aug 2016 04:08:02 +0300 + +cinder (2:8.0.0-5~u14.04+mos0) mos9.0; urgency=medium + + * Set minimal version for python-os-brick package. (LP: #1588799) + + -- Ivan Udovichenko Fri, 03 Jun 2016 17:57:11 +0300 + +cinder (2:8.0.0-4~u14.04+mos0) mos9.0; urgency=medium + + * Source: https://anonscm.debian.org/git/openstack/cinder.git + Commit: 176328de76075e70f92c97e09bee5e1e85a42f28 + * Fix (build-)dependencies. + + -- Ivan Udovichenko Wed, 27 Apr 2016 18:14:36 +0300 + +cinder (2:8.0.0-2) unstable; urgency=medium + + [ Ondřej Nový ] + * Standards-Version is 3.9.8 now (no change) + + [ Thomas Goirand ] + * Fixed endpoint creation that was buggy: it was using keystone admin auth + token which we removed for Mitaka (Closes: #820844). + + -- Thomas Goirand Wed, 13 Apr 2016 20:21:03 +0000 + +cinder (2:8.0.0-1) unstable; urgency=medium + + * New upstream release. + + -- Thomas Goirand Thu, 07 Apr 2016 21:08:51 +0200 + +cinder (2:8.0.0~rc2-1) unstable; urgency=medium + + * New upstream release. + * Uploading to unstable. + * Updated ja.po debconf translation (Closes: #816343). + * Ran debconf-updatepo. + + -- Thomas Goirand Tue, 05 Apr 2016 10:43:20 +0200 + +cinder (2:8.0.0~rc1-2) experimental; urgency=medium + + * Do not use Keystone admin auth token to register API endpoint. + + -- Thomas Goirand Tue, 29 Mar 2016 12:24:55 +0000 + +cinder (2:8.0.0~rc1-1) experimental; urgency=medium + + * New upstream release. + * Disable non-deterministic failed tests: + cinder.tests.unit.test_volume.VolumeTestCase.test_create_delete_volume + * Fixed (build-)depends for this release. + * Reworked install-missing-files.patch. + * Standards-Version: 3.9.7 (no change). + + -- Thomas Goirand Mon, 14 Mar 2016 14:10:58 +0100 + +cinder (2:8.0.0~b3-3~u14.04+mos1~u14.04+mos0) mos9.0; urgency=medium + + * Source: https://anonscm.debian.org/git/openstack/cinder.git + Commit: 176328de76075e70f92c97e09bee5e1e85a42f28 + * Fix (build-)dependencies. + + -- Ivan Udovichenko Wed, 27 Apr 2016 17:26:45 +0300 + +cinder (2:8.0.0~b3-3~u14.04+mos1) mos9.0; urgency=medium + + * Remove cinder.conf file. + * Add config generator. + + -- Maksym Yatsenko Wed, 16 Mar 2016 10:57:24 +0200 + +cinder (2:8.0.0~b3-2~u14.04+mos1) mos9.0; urgency=medium + + * Sync d/control from anonscm.debian.org + * Remove obsolete patch + + -- Mikhail Ivanov Mon, 14 Mar 2016 12:15:24 +0300 + +cinder (2:8.0.0~b3-1) experimental; urgency=medium + + [ Thomas Goirand ] + * New upstream release. + * Fixed (build-)depends for this release. + * New (build-)depends on python-oauth2client to ensure its version. + * Added missing build-depends on git, needed by sphinx-build. + * Fixed config file generation. + * Refreshed / rebased patches. + + [ Ondřej Nový ] + * Fixed homepage (https). + * Fixed VCS URLs (https). + + -- Thomas Goirand Mon, 25 Jan 2016 10:02:39 +0000 + +cinder (2:8.0.0~b2-1) experimental; urgency=medium + + * New upstream release. + * Fixed (build-)depends for this release. + * Removed disable-zfs-tests.patch. + * Removed Downstream_Fix_for_Genconfig.patch. + * Added patch to remove zfssa tests. + * Added a doc-base registration file. + + -- Thomas Goirand Mon, 07 Dec 2015 14:05:41 +0100 + +cinder (2:8.0.0-1~u14.04+mos1) mos9.0; urgency=medium + + * Version synced from anonscm.debian.org/debian/mitaka/for-trusty + * Requirements updated to global Mitaka + + -- Artem Silenkov Tue, 19 Jan 2016 14:58:39 +0300 + +cinder (2:8.0.0~b1-1) experimental; urgency=medium + + * New upstream release. + * Fixed (build-)depends for this release. + * Removed disable-zfs-tests.patch. + * Removed Downstream_Fix_for_Genconfig.patch. + + -- Thomas Goirand Mon, 07 Dec 2015 14:05:41 +0100 + +cinder (2:7.0.0-4) unstable; urgency=medium + + * Added q-text-as-data as depends for cinder-api. + + -- Thomas Goirand Tue, 03 Nov 2015 11:32:01 +0000 + +cinder (2:7.0.0-3) unstable; urgency=medium + + * Using Keystone API v3 to register in the catalog. + + -- Thomas Goirand Mon, 02 Nov 2015 18:19:42 +0000 + +cinder (2:7.0.0-2) unstable; urgency=medium + + * Uploading to unstable. + + -- Thomas Goirand Fri, 16 Oct 2015 13:44:00 +0000 + +cinder (2:7.0.0-1) experimental; urgency=medium + + * New upstream release. + * Setup both v1 and v2 endpoints. + + -- Thomas Goirand Thu, 15 Oct 2015 15:49:18 +0200 + +cinder (2:7.0.0~rc2-1) experimental; urgency=medium + + * cinder-api depends on python-openstackclient. + * cinder-api also registering the volumev2 type. + * Fixed cinder.conf generation: + - Fixed the default path for lock_path. + - Added upstream patch for fixing config file generation. + - Manually set enabled_backends = lvm, and appends a [lvm] section to set + the LVM backend as default. + + -- Thomas Goirand Tue, 29 Sep 2015 13:23:42 +0000 + +cinder (2:7.0.0~rc1-1) experimental; urgency=medium + + * New upstream release. + * Fixed (build-)depends for this release. + * Refresh patch. + + -- Thomas Goirand Fri, 25 Sep 2015 10:01:08 +0200 + +cinder (2:7.0.0~b3-1) experimental; urgency=medium + + * New upstream release. + * Align with MOS packaging: + - Bumped EPOCH to 2 instead of 1. + - Some Ubuntu version lower bounds for dependencies. + - Added a cinder-doc package. + * Fixed (build-)depends for this release. + * Refreshed disable-zfs-tests.patch. + + -- Thomas Goirand Tue, 01 Sep 2015 13:56:21 +0200 + +cinder (1:7.0.0~b2-1) experimental; urgency=medium + + * New upstream release. + * Updated (build-)depends for this release. + * Fixed OSLO_PACKAGE_VERSION for last PBR version. + * Disable zfs tests. + + -- Thomas Goirand Fri, 10 Jul 2015 09:41:59 +0200 + +cinder (2015.1.0+2015.06.16.git26.9634b76ba5-3) unstable; urgency=medium + + * Rebuilt for sqlalchemy 1.0.6. + + -- Thomas Goirand Wed, 01 Jul 2015 02:21:46 +0000 + +cinder (2015.1.0+2015.06.16.git26.9634b76ba5-2) unstable; urgency=medium + + * Fixed changelog regarding CVE number: CVE-2015-1851 and not + CVE-2015-1850 (Closes: #789349). + + -- Thomas Goirand Sun, 21 Jun 2015 14:21:31 +0000 + +cinder (2015.1.0+2015.06.16.git26.9634b76ba5-1) unstable; urgency=high + + * New upstream release (based on commit 26th g9634b76): + - Addresses CVE-2015-1851 / OSSA 2015-011 (Closes: #788996). + + -- Thomas Goirand Tue, 16 Jun 2015 22:36:48 +0200 + +cinder (2015.1.0+2015.06.06.git24.493b6c7f12-1) unstable; urgency=medium + + * New upstream release (basing on commit 24th 2015.06.06 493b6c7f12). + * Fixed debian/watch file to read from correct cinder project and not Nova. + * Fixed config file generation taking patches from upstream. + + -- Thomas Goirand Mon, 11 May 2015 23:07:24 +0200 + +cinder (2015.1.0-1) unstable; urgency=medium + + * New upstream release. + * Fixed gbp.conf. + + -- Thomas Goirand Thu, 30 Apr 2015 21:33:43 +0000 + +cinder (2015.1~rc2-1) unstable; urgency=medium + + * New upstream release. + * Uploading to unstable. + * Updated (build-)depends for this release. + * Now generates cinder.conf on the fly. + * Added Fix_borked_StorPool_driver.patch + + -- Thomas Goirand Thu, 09 Apr 2015 23:48:10 +0200 + +cinder (2014.2.1-1) experimental; urgency=medium + + * New upstream release. + * Now depends on openstack-pkg-tools (>= 20~) to avoid systemd issues with + previous versions. + + -- Thomas Goirand Sun, 14 Dec 2014 08:59:02 +0000 + +cinder (2014.2-1) experimental; urgency=medium + + * New upstream release. + + -- Thomas Goirand Thu, 16 Oct 2014 15:23:17 +0000 + +cinder (2014.2~rc2-1) experimental; urgency=medium + + * New upstream release. + * Updated (build-)depends for this release. + * Switching to templated init scripts using openstack-pkg-tools >= 13. + * Mangling upstream rc and beta versions in watch file. + * Now using a single cinder-common.logrotate file instead of so many. + * Standards-Version is now 3.9.6 (no change). + + -- Thomas Goirand Sun, 05 Oct 2014 14:23:48 +0800 + +cinder (2014.2~rc1-1) experimental; urgency=medium + + * New upstream release. + * Updated (build-)depends for this release. + * Added more lintian-override for false positive about unused debconf + templates. + + -- Thomas Goirand Wed, 01 Oct 2014 15:43:51 +0800 + +cinder (2014.2~b3-2) experimental; urgency=medium + + * Fixed the DB connection directive name and section. + + -- Thomas Goirand Wed, 24 Sep 2014 18:50:02 +0800 + +cinder (2014.2~b3-1) experimental; urgency=medium + + [ Thomas Goirand ] + * New upstream release. + * New (build-)depends for this release. + * Removes usr/bin/cinder-rpc-zmq-receiver fron cinder-common.install, + as its gone upstream (moved into Oslo, it seems). + + [ gustavo panizzo ] + * Support to run cinder daemons under systemd. + + -- Thomas Goirand Sat, 20 Sep 2014 10:15:10 +0000 + +cinder (2014.1.1-2) unstable; urgency=medium + + * cinder-volume now depends on tgt >= 1:1.0.17-1.1~ (Closes: 751703). + + -- Thomas Goirand Mon, 16 Jun 2014 15:37:47 +0800 + +cinder (2014.1.1-1) unstable; urgency=medium + + * New upstream release. + * Removed fallback-to-None-on-missing-Glance-image-attrs.patch applied + upstream. + * Bumped python-six minimal requirements to 1.6.0. + + -- Thomas Goirand Mon, 09 Jun 2014 22:08:57 +0800 + +cinder (2014.1-7) unstable; urgency=medium + + * Now build-depends on openstack-pkg-tools >= 0.12~. + + -- Thomas Goirand Thu, 05 Jun 2014 07:04:33 +0000 + +cinder (2014.1-6) unstable; urgency=medium + + * Switched from restarting daemons to copytruncate in logrotate. + + -- Thomas Goirand Thu, 29 May 2014 14:01:00 +0800 + +cinder (2014.1-5) unstable; urgency=medium + + * Disable https for the default keystone conf, as this makes our CI fail. + + -- Thomas Goirand Mon, 05 May 2014 13:14:58 +0800 + +cinder (2014.1-4) unstable; urgency=medium + + * Updated intalian debconf translations (Closes: #745386). + + -- Thomas Goirand Sat, 03 May 2014 04:06:37 +0000 + +cinder (2014.1-3) unstable; urgency=medium + + * Now using keystone_authtoken in cinder.conf instead of api-paste.ini: + - Fixed config and postinst scripts of cinder-common to use that. + - Removed patch for api-paste.ini. + + -- Thomas Goirand Thu, 01 May 2014 00:01:50 +0800 + +cinder (2014.1-2) unstable; urgency=medium + + * Applied patch from Mike Perez to be able to create + volume from glance image without checksum. + + -- Thomas Goirand Sat, 26 Apr 2014 23:12:30 +0800 + +cinder (2014.1-1) unstable; urgency=medium + + * New upstream release. + * Uploading to unstable. + * Applied patch from Sylvain Baubeau to select + log destination (to syslog or to a file). + + -- Thomas Goirand Wed, 09 Apr 2014 22:09:38 +0800 + +cinder (2014.1~rc1-1) experimental; urgency=low + + * New upstream release. + * Removed now useless fix-sqlalchemy-version patch. + * Fixed new (build-)dependencies for this release. + + -- Thomas Goirand Fri, 28 Mar 2014 18:40:20 +0800 + +cinder (2014.1~b3-1) experimental; urgency=low + + * New upstream release. + + -- Thomas Goirand Mon, 17 Feb 2014 15:11:34 +0800 + +cinder (2013.2.2-2) unstable; urgency=medium + + * Rebuilt using openstack-pkg-tools >= 9. + + -- Thomas Goirand Fri, 14 Feb 2014 17:36:24 +0000 + +cinder (2013.2.2-1) unstable; urgency=medium + + * New upstream point release. + + -- Thomas Goirand Fri, 14 Feb 2014 11:04:50 +0800 + +cinder (2013.2.1-4) unstable; urgency=medium + + * Added postrotate script after logrotate to restart daemons. + * Fix webob version in requirements.txt. + + -- Thomas Goirand Mon, 03 Feb 2014 15:49:21 +0800 + +cinder (2013.2.1-3) unstable; urgency=medium + + * Updated fr.po debconf thanks to Julien Patriarca (Closes: #733091). + * New sv.po debconf translation thanks to Martin Bagge (Closes: #734585). + + -- Thomas Goirand Mon, 13 Jan 2014 17:27:07 +0800 + +cinder (2013.2.1-2) unstable; urgency=medium + + * Kills the "cinder enable" debconf feature. (Closes: #732547) + * Adds a Spanish debconf translation thanks to Matias A. Bellone + (Closes: #732535). + + -- Thomas Goirand Thu, 19 Dec 2013 15:46:34 +0800 + +cinder (2013.2.1-1) unstable; urgency=medium + + * New upstream release (Icehouse beta 1). + + -- Thomas Goirand Mon, 09 Dec 2013 21:07:33 +0800 + +cinder (2013.2-2) unstable; urgency=medium + + * Updated debconf translations with warm thanks to: + - French, Julien Patriarca (Closes: #728769). + - Russian, Yuri Kozlov (Closes: #729775). + + -- Thomas Goirand Sun, 08 Dec 2013 11:21:20 +0800 + +cinder (2013.2-1) unstable; urgency=low + + * New upstream release. + * Uploading to unstable. + * Fixed the path to the log files in the init scripts. + * Fixed the value of the state_path directive to /var/lib/cinder instead of + somewhere in /usr/lib/python2.x. + + -- Thomas Goirand Thu, 17 Oct 2013 01:02:21 +0800 + +cinder (2013.2~rc3-1) experimental; urgency=low + + * New upstream release. + * Kills the CEPH_ARGS hack in /etc/default/cinder and cinder-volume.init + since that's not needed anymore (upstream code manages this now in the + configuration file directly). + * sed -i "s/#auth_strategy=noauth/auth_strategy=keystone/" in the default + packaged cinder.conf (otherwise it doesn't work by default). + + -- Thomas Goirand Fri, 11 Oct 2013 22:54:46 +0800 + +cinder (2013.2~rc1-2) experimental; urgency=low + + * Updates the templates and translations to really (Closes: #708658). + + -- Thomas Goirand Wed, 09 Oct 2013 23:32:13 +0800 + +cinder (2013.2~rc1-1) experimental; urgency=low + + * New upstream release. + * Reviewed (build-)dependencies. + + -- Thomas Goirand Sat, 22 Jun 2013 16:27:46 +0800 + +cinder (2013.1.3-1) unstable; urgency=low + + * New upstream point release. + * Added several Debconf templates translations: + - Portuguese, thanks to Miguel Figueiredo (Closes: #705707). + - Italian, thanks to Beatrice Torracca (Closes: #719879). + - Czech, thanks to Michal Šimůnek (Closes: #721135). + * Removes now applied upstream patches for CVE-2013-4202 & CVE-2013-4183. + + -- Thomas Goirand Fri, 30 Aug 2013 11:35:22 +0800 + +cinder (2013.1.2-4) unstable; urgency=high + + * Adds missing depends: sqlite3. + * CVE-2013-4202: Fix DoS using XML entities in extensions (Closes: + * #719118). + * CVE-2013-4183: Enable zero the snapshot when delete snapshot in + LVMVolumeDriver (Closes: #719010). + + -- Thomas Goirand Sat, 13 Jul 2013 22:51:29 +0800 + +cinder (2013.1.2-3) unstable; urgency=low + + * Adds a patch to make it work with sqlalchemy >= 0.8 (Closes: #715431). + * Added build-depends: python-pywbem. + + -- Thomas Goirand Wed, 10 Jul 2013 15:28:16 +0800 + +cinder (2013.1.2-2) unstable; urgency=low + + * Starts Cinder after postgresql, mysql, keystone, rabbitmq-server and + * ntp. + * Added cinder-volume CEPH_ARGS export using what is configured in + /etc/default/cinder-volume. + * Rebuilds to use python-sqlalchemy >= 0.8. + + -- Thomas Goirand Sat, 22 Jun 2013 16:27:46 +0800 + +cinder (2013.1.2-1) unstable; urgency=low + + * New upstream release. + + -- Thomas Goirand Fri, 14 Jun 2013 22:55:23 +0800 + +cinder (2013.1.1-2) unstable; urgency=low + + * Added if [ -r /usr/share/dbconfig-common/dpkg/prerm ] in the prerm. + * Ran wrap-and-sort to clean stuff. + * Added creation and chown of /var/lib/cinder/{cache,volumes} after the + removal of the -R flag when doing the chown in openstack-pkg-tools. + + -- Thomas Goirand Thu, 23 May 2013 00:08:47 +0800 + +cinder (2013.1.1-1) unstable; urgency=low + + * Uploading to unstable. + * New upstream release. + * Fixed /etc/sudoers.d/cinder-common + * Reviewed package descriptions by the debian-l10n-english team. + + -- Thomas Goirand Thu, 11 Apr 2013 22:30:47 +0800 + +cinder (2013.1-1) experimental; urgency=low + + * New upstream release. + + -- Thomas Goirand Mon, 28 Jan 2013 15:54:59 +0800 + +cinder (2012.2.1-1) experimental; urgency=low + + [ Thomas Goirand ] + * New upstream release 2012.2.1 + * Fixes wrong handling (eg: policy violation) of /etc/cinder/cinder.conf. + * Now uses pkgos_func functions for debconf and dbconfig-common handling. + * Renames /etc/sudoers.d/cinder_sudoers as /etc/sudoers.d/cinder-common. + * Debconf now users cinder/ and not cinder-common/. + * Reviewed long and short descriptions in debian/control. + * Bumped Build-Depends-Indep: python-all to 2.6.6-3~ since we are using + dh_python2. + * Added everyone in the team as Uploaders:. + * Changed Homepage field to http://cinder.openstack.org/. + * Dependencies are now by alpha order. + * Removed useless empty cinder-volume.postrm, cinder-api.postrm, + cinder-scheduler.postinst, cinder-scheduler.postrm. + * Pre-Depends: dpkg (>= 1.15.6~) because we use xz compression. + * Asks for admin tenant, user and password with debconf, patches + api-paste.ini so it is syntaxicaly correct. + * Auto-detects a valide volume group name, and prompt the user with debconf + about it. + + -- Thomas Goirand Sun, 02 Dec 2012 07:00:49 +0000 + +cinder (2012.2~rc1+git1~6b31057-1) experimental; urgency=low + + * First debian release + + -- Mehdi Abaakouk Thu, 13 Sep 2012 15:52:06 +0200 + +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/xenial/debian/cinder-api.init.in b/xenial/debian/cinder-api.init.in new file mode 100644 index 000000000..1f715f6e8 --- /dev/null +++ b/xenial/debian/cinder-api.init.in @@ -0,0 +1,18 @@ +#!/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: Thomas Goirand +DESC="OpenStack Cinder Api" +PROJECT_NAME=cinder +NAME=${PROJECT_NAME}-api diff --git a/xenial/debian/cinder-api.install b/xenial/debian/cinder-api.install new file mode 100644 index 000000000..98e58c1a9 --- /dev/null +++ b/xenial/debian/cinder-api.install @@ -0,0 +1 @@ +usr/bin/cinder-api diff --git a/xenial/debian/cinder-api.manpages b/xenial/debian/cinder-api.manpages new file mode 100644 index 000000000..0cc348b20 --- /dev/null +++ b/xenial/debian/cinder-api.manpages @@ -0,0 +1 @@ +debian/man/cinder-api.8 diff --git a/xenial/debian/cinder-backup.init.in b/xenial/debian/cinder-backup.init.in new file mode 100644 index 000000000..22c56ddaf --- /dev/null +++ b/xenial/debian/cinder-backup.init.in @@ -0,0 +1,17 @@ +#!/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 +DESC="OpenStack Cinder Backup" +PROJECT_NAME=cinder +NAME=${PROJECT_NAME}-backup diff --git a/xenial/debian/cinder-backup.install b/xenial/debian/cinder-backup.install new file mode 100644 index 000000000..b362ab5c5 --- /dev/null +++ b/xenial/debian/cinder-backup.install @@ -0,0 +1 @@ +usr/bin/cinder-backup diff --git a/xenial/debian/cinder-common.dirs b/xenial/debian/cinder-common.dirs new file mode 100644 index 000000000..989ecfa5e --- /dev/null +++ b/xenial/debian/cinder-common.dirs @@ -0,0 +1 @@ +etc/cinder/rootwrap.d diff --git a/xenial/debian/cinder-common.install b/xenial/debian/cinder-common.install new file mode 100644 index 000000000..3fb3a28e5 --- /dev/null +++ b/xenial/debian/cinder-common.install @@ -0,0 +1,7 @@ +etc/cinder/api-paste.ini /usr/share/cinder-common +etc/cinder/policy.json /etc/cinder +etc/cinder/rootwrap.conf /etc/cinder +usr/bin/cinder-manage +usr/bin/cinder-rootwrap +usr/bin/cinder-rtstool +usr/bin/cinder-wsgi diff --git a/xenial/debian/cinder-common.logrotate b/xenial/debian/cinder-common.logrotate new file mode 100644 index 000000000..f96b1b8bb --- /dev/null +++ b/xenial/debian/cinder-common.logrotate @@ -0,0 +1,8 @@ +/var/log/cinder/*.log { + daily + missingok + compress + delaycompress + notifempty + copytruncate +} diff --git a/xenial/debian/cinder-common.manpages b/xenial/debian/cinder-common.manpages new file mode 100644 index 000000000..23a27ccfb --- /dev/null +++ b/xenial/debian/cinder-common.manpages @@ -0,0 +1,2 @@ +debian/man/cinder-manage.8 +debian/man/cinder-rootwrap.8 diff --git a/xenial/debian/cinder-common.postinst.in b/xenial/debian/cinder-common.postinst.in new file mode 100644 index 000000000..172974ce4 --- /dev/null +++ b/xenial/debian/cinder-common.postinst.in @@ -0,0 +1,27 @@ +#!/bin/sh + +set -e + +CINDER_CONF=/etc/cinder/cinder.conf + +#PKGOS-INCLUDE# + +if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then + pkgos_var_user_group cinder + + # we need few folders with cinder:cinder rights. + mkdir -p /var/lib/cinder/cache + mkdir -p /var/lib/cinder/volumes + chown cinder:cinder /var/lib/cinder/cache + chown cinder:cinder /var/lib/cinder/volumes + + pkgos_write_new_conf cinder cinder.conf + pkgos_write_new_conf cinder api-paste.ini + pkgos_write_new_conf cinder logging.conf + + chmod 0440 /etc/sudoers.d/cinder-common +fi + +#DEBHELPER# + +exit 0 diff --git a/xenial/debian/cinder-common.postrm b/xenial/debian/cinder-common.postrm new file mode 100644 index 000000000..ede7e2aa6 --- /dev/null +++ b/xenial/debian/cinder-common.postrm @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +if [ "$1" = "purge" ] ; then + rm -f /etc/cinder/cinder.conf /etc/cinder/api-paste.ini /etc/cinder/logging.conf + rmdir --ignore-fail-on-non-empty /etc/cinder || true + rm -f /etc/default/cinder-common + rm -rf /var/lib/cinder /var/log/cinder +fi + +#DEBHELPER# + +exit 0 diff --git a/xenial/debian/cinder-common.sudoers b/xenial/debian/cinder-common.sudoers new file mode 100644 index 000000000..ed5d479de --- /dev/null +++ b/xenial/debian/cinder-common.sudoers @@ -0,0 +1,3 @@ +Defaults:cinder !requiretty + +cinder ALL = (root) NOPASSWD: /usr/bin/cinder-rootwrap /etc/cinder/rootwrap.conf * diff --git a/xenial/debian/cinder-common.tmpfile b/xenial/debian/cinder-common.tmpfile new file mode 100644 index 000000000..cb4b3167d --- /dev/null +++ b/xenial/debian/cinder-common.tmpfile @@ -0,0 +1 @@ +d /run/cinder 0755 cinder cinder - diff --git a/xenial/debian/cinder-doc.doc-base b/xenial/debian/cinder-doc.doc-base new file mode 100644 index 000000000..268db89a8 --- /dev/null +++ b/xenial/debian/cinder-doc.doc-base @@ -0,0 +1,9 @@ +Document: cinder +Title: cinder Documentation +Author: N/A +Abstract: Sphinx documentation for Cinder +Section: Programming/Python + +Format: HTML +Index: /usr/share/doc/cinder-doc/html/index.html +Files: /usr/share/doc/cinder-doc/html/* diff --git a/xenial/debian/cinder-scheduler.init.in b/xenial/debian/cinder-scheduler.init.in new file mode 100644 index 000000000..486670494 --- /dev/null +++ b/xenial/debian/cinder-scheduler.init.in @@ -0,0 +1,18 @@ +#!/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: Thomas Goirand +DESC="OpenStack Cinder Scheduler" +PROJECT_NAME=cinder +NAME=${PROJECT_NAME}-scheduler diff --git a/xenial/debian/cinder-scheduler.install b/xenial/debian/cinder-scheduler.install new file mode 100644 index 000000000..8d994a17a --- /dev/null +++ b/xenial/debian/cinder-scheduler.install @@ -0,0 +1 @@ +usr/bin/cinder-scheduler diff --git a/xenial/debian/cinder-scheduler.manpages b/xenial/debian/cinder-scheduler.manpages new file mode 100644 index 000000000..4d6e93c10 --- /dev/null +++ b/xenial/debian/cinder-scheduler.manpages @@ -0,0 +1 @@ +debian/man/cinder-scheduler.8 diff --git a/xenial/debian/cinder-volume.init.in b/xenial/debian/cinder-volume.init.in new file mode 100644 index 000000000..98439f026 --- /dev/null +++ b/xenial/debian/cinder-volume.init.in @@ -0,0 +1,18 @@ +#!/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: Thomas Goirand +DESC="OpenStack Cinder Volume" +PROJECT_NAME=cinder +NAME=${PROJECT_NAME}-volume diff --git a/xenial/debian/cinder-volume.install b/xenial/debian/cinder-volume.install new file mode 100644 index 000000000..ae47712db --- /dev/null +++ b/xenial/debian/cinder-volume.install @@ -0,0 +1,4 @@ +debian/cinder_tgt.conf etc/tgt/conf.d +etc/cinder/rootwrap.d/volume.filters /etc/cinder/rootwrap.d +usr/bin/cinder-volume +usr/bin/cinder-volume-usage-audit diff --git a/xenial/debian/cinder-volume.manpages b/xenial/debian/cinder-volume.manpages new file mode 100644 index 000000000..87e53e944 --- /dev/null +++ b/xenial/debian/cinder-volume.manpages @@ -0,0 +1 @@ +debian/man/cinder-volume.8 diff --git a/xenial/debian/cinder-volume.postinst.in b/xenial/debian/cinder-volume.postinst.in new file mode 100644 index 000000000..42484208c --- /dev/null +++ b/xenial/debian/cinder-volume.postinst.in @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +#PKGOS-INCLUDE# + +if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then + pkgos_var_user_group cinder + 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 +fi + +#DEBHELPER# + +exit 0 diff --git a/xenial/debian/cinder_tgt.conf b/xenial/debian/cinder_tgt.conf new file mode 100644 index 000000000..444eb00e4 --- /dev/null +++ b/xenial/debian/cinder_tgt.conf @@ -0,0 +1 @@ +include /var/lib/cinder/volumes/* diff --git a/xenial/debian/compat b/xenial/debian/compat new file mode 100644 index 000000000..ec635144f --- /dev/null +++ b/xenial/debian/compat @@ -0,0 +1 @@ +9 diff --git a/xenial/debian/control b/xenial/debian/control new file mode 100644 index 000000000..d5ef0847d --- /dev/null +++ b/xenial/debian/control @@ -0,0 +1,290 @@ +Source: cinder +Section: net +Priority: extra +Maintainer: PKG OpenStack +Uploaders: Thomas Goirand , +Build-Depends: debhelper (>= 9), + dh-python, + dh-systemd, + openstack-pkg-tools (>= 40~), + python-all, + python-pbr (>= 1.8), + python-setuptools (>= 16.0), + python-sphinx (>= 1.1.2), +Build-Depends-Indep: bandit (>= 0.13.2), + git, + python-anyjson (>= 0.3.3), + python-babel (>= 1.3), + python-barbicanclient (>= 3.3.0), + python-coverage (>= 3.6), + python-crypto (>= 2.6), + python-decorator (>= 3.4.0), + python-ddt (>= 1.0.1), + python-enum34, + python-eventlet (>= 0.18.4), + python-fixtures (>= 1.3.1), + python-glanceclient (>= 1:2.0.0), + python-googleapi (>= 1.4.2), + python-greenlet (>= 0.3.2), + python-hacking (>= 0.10.2), + python-httplib2 (>= 0.7.5), + python-iso8601 (>= 0.1.9), + python-keystoneclient (>= 1:1.6.0), + python-keystonemiddleware (>= 4.0.0), + python-lxml (>= 2.3), + python-migrate (>= 0.9.6), + python-mock (>= 1.3), + python-mox3 (>= 0.7.0), + python-mysqldb, + python-novaclient (>= 2:2.29.0), + python-oauth2client (>= 1.5.0), + python-os-brick (>= 1.2.0-4~), + python-os-testr (>= 0.4.2), + python-os-win (>= 0.2.3), + python-oslo.concurrency (>= 3.5.0), + python-oslo.config (>= 1:3.7.0), + python-oslo.context (>= 0.2.0), + python-oslo.db (>= 4.1.0), + python-oslo.i18n (>= 2.1.0), + python-oslo.log (>= 2.0.0), + python-oslo.messaging (>= 4.0.0), + python-oslo.middleware (>= 3.0.0), + python-oslo.policy (>= 0.5.0), + python-oslo.reports (>= 1.0.0), + python-oslo.rootwrap (>= 2.0.0), + python-oslo.serialization (>= 2.0.0), + python-oslo.service (>= 1.0.0), + python-oslo.utils (>= 3.5.0), + python-oslo.versionedobjects (>= 1.5.0), + python-oslo.vmware (>= 1.16.0), + python-oslosphinx (>= 2.5.0), + python-oslotest (>= 1.10.0), + python-osprofiler (>= 1.1.0), + python-paramiko (>= 1.16.0), + python-paste, + python-pastedeploy (>= 1.5.0), + python-psutil (>= 1.1.1), + python-psycopg2 (>= 2.5), + python-pymysql (>= 0.6.2), + python-pyparsing (>= 2.0.1), + python-pywbem, + python-requests (>= 2.8.1), + python-retrying (>= 1.2.3), + python-routes (>= 1.12.3), + python-rtslib-fb (>= 2.1.57), + python-simplejson (>= 2.2.0), + python-six (>= 1.9.0), + python-sqlalchemy (>= 1.0.10), + python-stevedore (>= 1.5.0), + python-swiftclient (>= 1:2.2.0), + python-taskflow (>= 1.26.0), + python-tempest-lib (>= 0.14.0), + python-testresources (>= 0.2.4), + python-testscenarios (>= 0.4), + python-testtools (>= 1.4.0), + python-tooz (>= 1.28.0), + python-tz (>= 2013.6), + python-webob (>= 1.2.3), + subunit, + testrepository, +Standards-Version: 3.9.8 +Vcs-Browser: https://anonscm.debian.org/cgit/openstack/cinder.git/ +Vcs-Git: https://anonscm.debian.org/git/openstack/cinder.git +Homepage: https://github.com/openstack/cinder + +Package: python-cinder +Section: python +Architecture: all +Depends: python-babel (>= 1.3), + python-barbicanclient (>= 3.3.0), + python-ceph, + python-crypto (>= 2.6), + python-decorator (>= 3.4.0), + python-eventlet (>= 0.18.4), + python-glanceclient (>= 1:2.0.0), + python-googleapi (>= 1.4.2), + python-greenlet (>= 0.3.2), + python-httplib2 (>= 0.7.5), + python-hp3parclient, + python-iso8601 (>= 0.1.9), + python-keystoneclient (>= 1:1.6.0), + python-keystonemiddleware (>= 4.0.0), + python-lxml (>= 2.3), + python-migrate (>= 0.9.6), + python-mysqldb, + python-novaclient (>= 2:2.29.0), + python-oauth2client (>= 1.5.0), + python-os-brick (>= 1.2.0-4~), + python-os-win (>= 0.2.3), + python-oslo.concurrency (>= 3.5.0), + python-oslo.config (>= 1:3.7.0), + python-oslo.context (>= 0.2.0), + python-oslo.db (>= 4.1.0), + python-oslo.i18n (>= 2.1.0), + python-oslo.log (>= 2.0.0), + python-oslo.messaging (>= 4.0.0), + python-oslo.middleware (>= 3.0.0), + python-oslo.policy (>= 0.5.0), + python-oslo.reports (>= 1.0.0), + python-oslo.rootwrap (>= 2.0.0), + python-oslo.serialization (>= 2.0.0), + python-oslo.service (>= 1.0.0), + python-oslo.utils (>= 3.5.0), + python-oslo.versionedobjects (>= 1.5.0), + python-oslo.vmware (>= 1.16.0), + python-osprofiler (>= 1.1.0), + python-paramiko (>= 1.16.0), + python-paste, + python-pastedeploy (>= 1.5.0), + python-pbr (>= 1.8), + python-psutil (>= 1.1.1), + python-psycopg2 (>= 2.5), + python-pymysql (>= 0.6.2), + python-pyparsing (>= 2.0.1), + python-requests (>= 2.8.1), + python-retrying (>= 1.2.3), + python-routes (>= 1.12.3), + python-rtslib-fb (>= 2.1.57), + python-simplejson (>= 2.2.0), + python-six (>= 1.9.0), + python-sqlalchemy (>= 1.0.10), + python-stevedore (>= 1.5.0), + python-swiftclient (>= 1:2.2.0), + python-taskflow (>= 1.26.0), + python-tooz (>= 1.28.0), + python-tz (>= 2013.6), + python-webob (>= 1.2.3), + ${misc:Depends}, + ${python:Depends}, +Description: OpenStack block storage system - Python libraries + Cinder is a block Storage-as-a-Service system for the OpenStack cloud + computing suite. It re-implements the features of Nova-volume, which it + directly replaces. + . + Cinder uses LVM partitions of your volume servers in order to provide iSCSI + permanent block storage devices for your virtual machines running on Nova. + It also has back-end drivers for many hardware and software storage solutions + like Ceph, NFS, Net-APP, etc. + . + This package contains the Python libraries that are part of Cinder. + +Package: cinder-common +Architecture: all +Depends: adduser, + python-cinder (= ${binary:Version}), + sqlite3, + ${misc:Depends}, + ${python:Depends}, +Provides: ${python:Provides}, +Description: OpenStack block storage system - common files + Cinder is a block Storage-as-a-Service system for the OpenStack cloud + computing suite. It re-implements the features of Nova-volume, which it + directly replaces. + . + Cinder uses LVM partitions of your volume servers in order to provide iSCSI + permanent block storage devices for your virtual machines running on Nova. + It also has back-end drivers for many hardware and software storage solutions + like Ceph, NFS, Net-APP, etc. + . + This package contains common files and configuration that are + needed by all the daemon packages of Cinder. + +Package: cinder-api +Architecture: all +Depends: adduser, + cinder-common (= ${binary:Version}), + python-keystoneclient (>= 1.6.0), + python-openstackclient (>= 2.1.0), + ${misc:Depends}, + ${ostack-lsb-base}, + ${python:Depends}, +Suggests: q-text-as-data, +Description: OpenStack block storage system - API server + Cinder is a block Storage-as-a-Service system for the OpenStack cloud + computing suite. It re-implements the features of Nova-volume, which it + directly replaces. + . + Cinder uses LVM partitions of your volume servers in order to provide iSCSI + permanent block storage devices for your virtual machines running on Nova. + It also has back-end drivers for many hardware and software storage solutions + like Ceph, NFS, Net-APP, etc. + . + This package contains the Cinder API server. + +Package: cinder-volume +Architecture: all +Depends: adduser, + cinder-common (= ${binary:Version}), + lvm2, + qemu-utils, + tgt, + ${misc:Depends}, + ${ostack-lsb-base}, + ${python:Depends}, +Suggests: ceph-common, +Description: OpenStack block storage system - Volume server + Cinder is a block Storage-as-a-Service system for the OpenStack cloud + computing suite. It re-implements the features of Nova-volume, which it + directly replaces. + . + Cinder uses LVM partitions of your volume servers in order to provide iSCSI + permanent block storage devices for your virtual machines running on Nova. + It also has back-end drivers for many hardware and software storage solutions + like Ceph, NFS, Net-APP, etc. + . + This package contains the Cinder Volume server. + +Package: cinder-scheduler +Architecture: all +Depends: cinder-common (= ${binary:Version}), + ${misc:Depends}, + ${ostack-lsb-base}, + ${python:Depends}, +Description: OpenStack block storage system - Scheduler server + Cinder is a block Storage-as-a-Service system for the OpenStack cloud + computing suite. It re-implements the features of Nova-volume, which it + directly replaces. + . + Cinder uses LVM partitions of your volume servers in order to provide iSCSI + permanent block storage devices for your virtual machines running on Nova. + It also has back-end drivers for many hardware and software storage solutions + like Ceph, NFS, Net-APP, etc. + . + This package contains the Cinder Scheduler server. + +Package: cinder-backup +Architecture: all +Depends: adduser, + cinder-common (= ${binary:Version}), + ${misc:Depends}, + ${ostack-lsb-base}, + ${python:Depends}, +Description: OpenStack block storage system - Backup server + Cinder is a block Storage-as-a-Service system for the OpenStack cloud + computing suite. It re-implements the features of Nova-volume, which it + directly replaces. + . + Cinder uses LVM partitions of your volume servers in order to provide iSCSI + permanent block storage devices for your virtual machines running on Nova. + It also has back-end drivers for many hardware and software storage solutions + like Ceph, NFS, Net-APP, etc. + . + This package contains the Cinder backup service. + +Package: cinder-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, + ${sphinxdoc:Depends}, +Description: OpenStack block storage system - doc + Cinder is a block Storage-as-a-Service system for the OpenStack cloud + computing suite. It re-implements the features of Nova-volume, which it + directly replaces. + . + Cinder uses LVM partitions of your volume servers in order to provide iSCSI + permanent block storage devices for your virtual machines running on Nova. + It also has back-end drivers for many hardware and software storage + solutions + like Ceph, NFS, Net-APP, etc. + . + This package contains the documentation. diff --git a/xenial/debian/copyright b/xenial/debian/copyright new file mode 100644 index 000000000..423124d03 --- /dev/null +++ b/xenial/debian/copyright @@ -0,0 +1,25 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: cinder +Source: git://github.com/openstack/cinder.git + +Files: * +Copyright: (c) 2010 United States Government as represented + by the Administrator of the National Aeronautics + and Space Administration. + (c) 2010 OpenStack LLC + (c) 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/xenial/debian/debian_control_vars b/xenial/debian/debian_control_vars new file mode 100644 index 000000000..e736811af --- /dev/null +++ b/xenial/debian/debian_control_vars @@ -0,0 +1 @@ +ostack-lsb-base= lsb-base (>= 3.0-6) diff --git a/xenial/debian/gbp.conf b/xenial/debian/gbp.conf new file mode 100644 index 000000000..c737cbbfb --- /dev/null +++ b/xenial/debian/gbp.conf @@ -0,0 +1,8 @@ +[DEFAULT] +upstream-branch = master +debian-branch = debian/mitaka +upstream-tag = %(version)s +compression = xz + +[buildpackage] +export-dir = ../build-area/ diff --git a/xenial/debian/man/cinder-api.8 b/xenial/debian/man/cinder-api.8 new file mode 100644 index 000000000..e3f870e14 --- /dev/null +++ b/xenial/debian/man/cinder-api.8 @@ -0,0 +1,20 @@ +.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/xenial/debian/man/cinder-manage.8 b/xenial/debian/man/cinder-manage.8 new file mode 100644 index 000000000..687bb7b84 --- /dev/null +++ b/xenial/debian/man/cinder-manage.8 @@ -0,0 +1,21 @@ +.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/xenial/debian/man/cinder-rootwrap.8 b/xenial/debian/man/cinder-rootwrap.8 new file mode 100644 index 000000000..94d7f293c --- /dev/null +++ b/xenial/debian/man/cinder-rootwrap.8 @@ -0,0 +1,22 @@ +.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/xenial/debian/man/cinder-scheduler.8 b/xenial/debian/man/cinder-scheduler.8 new file mode 100644 index 000000000..e3f870e14 --- /dev/null +++ b/xenial/debian/man/cinder-scheduler.8 @@ -0,0 +1,20 @@ +.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/xenial/debian/man/cinder-volume.8 b/xenial/debian/man/cinder-volume.8 new file mode 100644 index 000000000..e3f870e14 --- /dev/null +++ b/xenial/debian/man/cinder-volume.8 @@ -0,0 +1,20 @@ +.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/xenial/debian/patches/Missing_configuration_opts_from_cinder.sample.conf.patch b/xenial/debian/patches/Missing_configuration_opts_from_cinder.sample.conf.patch new file mode 100644 index 000000000..456d85d28 --- /dev/null +++ b/xenial/debian/patches/Missing_configuration_opts_from_cinder.sample.conf.patch @@ -0,0 +1,276 @@ +Subject: Missing configuration opts from cinder.sample.conf + The logic for writing opts registered with register_opt() to the + auto-generated opts.py file was flawed in that the directories where + there were opts being registered with this method would be imported, + but the actual opt would be missed when looking through the file for + the name of the opt being registered. Now the singular opts are being + caught and written to opts.py for the oslo-config-generator to process. + . + The 'backend' section was added to generate_cinder_opts.py + due to some of the missing opts being a part of that section. + . + Also the way some of the opts that were being registered with groups + were incorrect and so this addresses those in both how they were + processed in generate_cinder_opts.py and the files in which they are being + registered. + . + There is also one change to the name of an opt in cinder/volume/api.py. + Instances such as this one will be caught by the in-progress hacking + check patch: https://review.openstack.org/#/c/223375/ +Author: Kendall Nelson +Date: Mon, 21 Sep 2015 18:11:19 +0000 (-0500) +X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fcinder.git;a=commitdiff_plain;h=10f5e92e1246dd33b244c4a7031bb81b17b240a3 +Change-Id: I8d333d7529d40f3a3b3651ca3a52c0048d96b99a +Bug-Ubuntu: https://bugs.launchpad.net/cinder/+bug/1498122 +Origin: upstream, https://review.openstack.org/#/c/225974/ +Last-Update: 2015-09-01 + +diff --git a/cinder/config/generate_cinder_opts.py b/cinder/config/generate_cinder_opts.py +index 9fa8d13..50c206b 100644 +--- a/cinder/config/generate_cinder_opts.py ++++ b/cinder/config/generate_cinder_opts.py +@@ -19,6 +19,8 @@ if __name__ == "__main__": + opt_file = open("cinder/opts.py", 'a') + opt_dict = {} + dir_trees_list = [] ++ REGISTER_OPTS_STR = "CONF.register_opts(" ++ REGISTER_OPT_STR = "CONF.register_opt(" + + opt_file.write("import copy\n") + opt_file.write("import itertools\n\n") +@@ -31,11 +33,11 @@ if __name__ == "__main__": + '+ | sed -e "s/^' + basedir + + '\///g" | sort -u') + +- cmd_opts = common_string % "CONF.register_opts(" ++ cmd_opts = common_string % REGISTER_OPTS_STR + output_opts = subprocess.check_output('{}'.format(cmd_opts), shell = True) + dir_trees_list = output_opts.split() + +- cmd_opt = common_string % "CONF.register_opt(" ++ cmd_opt = common_string % REGISTER_OPT_STR + output_opt = subprocess.check_output('{}'.format(cmd_opt), shell = True) + temp_list = output_opt.split() + +@@ -84,21 +86,29 @@ if __name__ == "__main__": + 'BRCD_FABRIC_EXAMPLE': [], + 'CISCO_FABRIC_EXAMPLE': [], + 'profiler': [], ++ 'backend': [], + 'DEFAULT': [], } + + def _write_item(opts): + list_name = opts[-3:] +- if list_name.lower() == "opts": ++ if list_name.lower() == "opt": + opt_file.write(" [" + opts.strip("\n") + "],\n") + else: + opt_file.write(" " + opts.strip("\n") + ",\n") + ++ def _retrieve_name(aline): ++ if REGISTER_OPT_STR in aline: ++ str_to_replace = REGISTER_OPT_STR ++ else: ++ str_to_replace = REGISTER_OPTS_STR ++ return aline.replace(str_to_replace, "") ++ + for key in opt_dict: + fd = os.open(opt_dict[key], os.O_RDONLY) + afile = os.fdopen(fd, "r") + + for aline in afile: +- exists = aline.find("CONF.register_opts(") ++ exists = aline.find("CONF.register_opt") + if exists != -1: + # TODO(kjnelson) FIX THIS LATER. These are instances where + # CONF.register_opts is happening without actually registering +@@ -109,41 +119,48 @@ if __name__ == "__main__": + continue + + if aline.find("fc-zone-manager") != -1: +- fc_zm_list = aline.replace("CONF.register_opts(", '') +- fc_zm_list = fc_zm_list.replace(", 'fc-zone-manager')", '') +- fc_zm_list.strip() ++ fc_zm_list = _retrieve_name(aline) ++ replace_string = ", group='fc-zone-manager')" ++ fc_zm_list = fc_zm_list.replace(replace_string, '') ++ fc_zm_list = fc_zm_list.strip() + line = key + "." + fc_zm_list + registered_opts_dict['fc-zone-manager'].append(line) + elif aline.find("keymgr") != -1: +- keymgr_list = aline.replace("CONF.register_opts(", '') ++ keymgr_list = _retrieve_name(aline) + keymgr_list = keymgr_list.replace(", group='keymgr')", '') +- keymgr_list = keymgr_list.replace(", 'keymgr')", '') +- keymgr_list.strip() ++ keymgr_list = keymgr_list.strip() + line = key + "." + keymgr_list + registered_opts_dict['keymgr'].append(line) + elif aline.find("BRCD_FABRIC_EXAMPLE") != -1: +- brcd_list = aline.replace("CONF.register_opts(", '') +- replace_string = ", 'BRCD_FABRIC_EXAMPLE')" ++ brcd_list = _retrieve_name(aline) ++ replace_string = ", group='BRCD_FABRIC_EXAMPLE')" + brcd_list = brcd_list.replace(replace_string, '') +- brcd_list.strip() ++ brcd_list = brcd_list.strip() + line = key + "." + brcd_list + registered_opts_dict['BRCD_FABRIC_EXAMPLE'].append(line) + elif aline.find("CISCO_FABRIC_EXAMPLE") != -1: +- cisco_list = aline.replace("CONF.register_opts(", '') +- replace_string = ", 'CISCO_FABRIC_EXAMPLE')" ++ cisco_list = _retrieve_name(aline) ++ replace_string = ", group='CISCO_FABRIC_EXAMPLE')" + cisco_list = cisco_list.replace(replace_string, '') +- cisco_list.strip() ++ cisco_list = cisco_list.strip() + line = key + "." + cisco_list + registered_opts_dict['CISCO_FABRIC_EXAMPLE'].append(line) + elif aline.find("profiler") != -1: +- profiler_list = aline.replace("CONF.register_opts(", '') ++ profiler_list = _retrieve_name(aline) + replace_string = ', group="profiler")' + profiler_list = profiler_list.replace(replace_string, '') +- profiler_list.strip() ++ profiler_list = profiler_list.strip() + line = key + "." + profiler_list + registered_opts_dict['profiler'].append(line) ++ elif aline.find("backend") != -1: ++ backend_list = _retrieve_name(aline) ++ replace_string = ', group=backend)' ++ backend_list = backend_list.replace(replace_string, '') ++ backend_list = backend_list.strip() ++ line = key + "." + backend_list ++ registered_opts_dict['backend'].append(line) + else: +- default_list = aline.replace("CONF.register_opts(", '') ++ default_list = _retrieve_name(aline) + default_list = default_list.replace(')', '').strip() + line = key + "." + default_list + registered_opts_dict['DEFAULT'].append(line) +@@ -166,6 +183,14 @@ if __name__ == "__main__": + for item in registered_opts_dict["profiler"]: + _write_item(item) + ++ backend_str = (" )),\n" ++ " ('backend',\n" ++ " itertools.chain(\n") ++ opt_file.write(backend_str) ++ ++ for item in registered_opts_dict["backend"]: ++ _write_item(item) ++ + cisco_str = (" )),\n" + " ('CISCO_FABRIC_EXAMPLE',\n" + " itertools.chain(\n") +diff --git a/cinder/keymgr/key_mgr.py b/cinder/keymgr/key_mgr.py +index 4d8bbdb..71ed7a7 100644 +--- a/cinder/keymgr/key_mgr.py ++++ b/cinder/keymgr/key_mgr.py +@@ -32,7 +32,7 @@ encryption_opts = [ + ] + + CONF = cfg.CONF +-CONF.register_opts(encryption_opts, 'keymgr') ++CONF.register_opts(encryption_opts, group='keymgr') + + + @six.add_metaclass(abc.ABCMeta) +diff --git a/cinder/volume/api.py b/cinder/volume/api.py +index 03f1d74..5db3a7b 100644 +--- a/cinder/volume/api.py ++++ b/cinder/volume/api.py +@@ -52,12 +52,13 @@ from cinder.volume import utils as volume_utils + from cinder.volume import volume_types + + +-allow_force_upload = cfg.BoolOpt('enable_force_upload', +- default=False, +- help='Enables the Force option on ' +- 'upload_to_image. This enables ' +- 'running upload_volume on in-use ' +- 'volumes for backends that support it.') ++allow_force_upload_opt = cfg.BoolOpt('enable_force_upload', ++ default=False, ++ help='Enables the Force option on ' ++ 'upload_to_image. This enables ' ++ 'running upload_volume on in-use ' ++ 'volumes for backends that ' ++ 'support it.') + volume_host_opt = cfg.BoolOpt('snapshot_same_host', + default=True, + help='Create volume from snapshot at the host ' +@@ -73,7 +74,7 @@ az_cache_time_opt = cfg.IntOpt('az_cache_duration', + 'seconds') + + CONF = cfg.CONF +-CONF.register_opt(allow_force_upload) ++CONF.register_opt(allow_force_upload_opt) + CONF.register_opt(volume_host_opt) + CONF.register_opt(volume_same_az_opt) + CONF.register_opt(az_cache_time_opt) +diff --git a/cinder/zonemanager/drivers/brocade/brcd_fabric_opts.py b/cinder/zonemanager/drivers/brocade/brcd_fabric_opts.py +index 6c1276a..26c8fbe 100644 +--- a/cinder/zonemanager/drivers/brocade/brcd_fabric_opts.py ++++ b/cinder/zonemanager/drivers/brocade/brcd_fabric_opts.py +@@ -50,7 +50,7 @@ brcd_zone_opts = [ + ] + + CONF = cfg.CONF +-CONF.register_opts(brcd_zone_opts, 'BRCD_FABRIC_EXAMPLE') ++CONF.register_opts(brcd_zone_opts, group='BRCD_FABRIC_EXAMPLE') + LOG = logging.getLogger(__name__) + + +diff --git a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py +index 696af1f..506888d 100644 +--- a/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py ++++ b/cinder/zonemanager/drivers/brocade/brcd_fc_zone_driver.py +@@ -52,7 +52,7 @@ brcd_opts = [ + ] + + CONF = cfg.CONF +-CONF.register_opts(brcd_opts, 'fc-zone-manager') ++CONF.register_opts(brcd_opts, group='fc-zone-manager') + + + class BrcdFCZoneDriver(fc_zone_driver.FCZoneDriver): +diff --git a/cinder/zonemanager/drivers/cisco/cisco_fabric_opts.py b/cinder/zonemanager/drivers/cisco/cisco_fabric_opts.py +index c105b31..0aa0cea 100644 +--- a/cinder/zonemanager/drivers/cisco/cisco_fabric_opts.py ++++ b/cinder/zonemanager/drivers/cisco/cisco_fabric_opts.py +@@ -47,7 +47,7 @@ cisco_zone_opts = [ + ] + + CONF = cfg.CONF +-CONF.register_opts(cisco_zone_opts, 'CISCO_FABRIC_EXAMPLE') ++CONF.register_opts(cisco_zone_opts, group='CISCO_FABRIC_EXAMPLE') + + + def load_fabric_configurations(fabric_names): +diff --git a/cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py b/cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py +index 98d4535..85d69b6 100644 +--- a/cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py ++++ b/cinder/zonemanager/drivers/cisco/cisco_fc_zone_driver.py +@@ -50,7 +50,7 @@ cisco_opts = [ + ] + + CONF = cfg.CONF +-CONF.register_opts(cisco_opts, 'fc-zone-manager') ++CONF.register_opts(cisco_opts, group='fc-zone-manager') + + + class CiscoFCZoneDriver(fc_zone_driver.FCZoneDriver): +diff --git a/cinder/zonemanager/fc_zone_manager.py b/cinder/zonemanager/fc_zone_manager.py +index ecbbe23..011890b 100644 +--- a/cinder/zonemanager/fc_zone_manager.py ++++ b/cinder/zonemanager/fc_zone_manager.py +@@ -64,7 +64,7 @@ zone_manager_opts = [ + ] + + CONF = cfg.CONF +-CONF.register_opts(zone_manager_opts, 'fc-zone-manager') ++CONF.register_opts(zone_manager_opts, group='fc-zone-manager') + + + class ZoneManager(fc_common.FCCommon): diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series new file mode 100644 index 000000000..e69de29bb diff --git a/xenial/debian/pydist-overrides b/xenial/debian/pydist-overrides new file mode 100644 index 000000000..98f65931c --- /dev/null +++ b/xenial/debian/pydist-overrides @@ -0,0 +1 @@ +babel diff --git a/xenial/debian/python-cinder.install b/xenial/debian/python-cinder.install new file mode 100644 index 000000000..036c6b9db --- /dev/null +++ b/xenial/debian/python-cinder.install @@ -0,0 +1 @@ +usr/lib/python*/dist-packages/* diff --git a/xenial/debian/rules b/xenial/debian/rules new file mode 100755 index 000000000..7a01a515c --- /dev/null +++ b/xenial/debian/rules @@ -0,0 +1,102 @@ +#!/usr/bin/make -f + +include /usr/share/openstack-pkg-tools/pkgos.make +export OSLO_PACKAGE_VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d' ' -f2 | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/' | head -n 1) + +export DH_VERBOSE=1 + +%: + dh $@ --buildsystem=python_distutils --with python2,systemd,sphinxdoc + +override_dh_auto_test: +ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) + @echo "===> Running tests" + set -e ; set -x ; for i in 2.7 ; do \ + PYMAJOR=`echo $$i | cut -d'.' -f1` ; \ + echo "===> Testing with python$$i (python$$PYMAJOR)" ; \ + rm -rf .testrepository ; \ + testr-python$$PYMAJOR init ; \ + TEMP_REZ=`mktemp -t` ; \ + PYTHONPATH=$(CURDIR) PYTHON=python$$i testr-python$$PYMAJOR run --subunit 'cinder\.tests\.unit\.(?!.*test_volume\.VolumeTestCase\.test_create_delete_volume.*)' | tee $$TEMP_REZ | subunit2pyunit ; \ + cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats ; \ + rm -f $$TEMP_REZ ; \ + testr-python$$PYMAJOR slowest ; \ + done +endif + +override_dh_clean: + dh_clean -O--buildsystem=python_distutils + rm -f debian/cinder-common.postinst debian/cinder-volume.postinst + rm -rf debian/*.upstart debian/*.service + +override_dh_auto_install: + echo "Do nothing..." + +override_dh_install: + python2.7 setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp + + mkdir -p $(CURDIR)/debian/cinder-common/usr/share/cinder-common + PYTHONPATH=$(CURDIR)/debian/tmp/usr/lib/python2.7/dist-packages oslo-config-generator \ + --output-file $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf \ + --wrap-width 80 \ + --namespace cinder \ + --namespace keystonemiddleware.auth_token \ + --namespace oslo.config \ + --namespace oslo.concurrency \ + --namespace oslo.context \ + --namespace oslo.db \ + --namespace oslo.i18n \ + --namespace oslo.log \ + --namespace oslo.messaging \ + --namespace oslo.middleware \ + --namespace oslo.policy \ + --namespace oslo.reports \ + --namespace oslo.rootwrap \ + --namespace oslo.serialization \ + --namespace oslo.service \ + --namespace oslo.utils \ + --namespace oslo.versionedobjects \ + --namespace oslo.vmware + + dh_install --fail-missing -Xbin/cinder-all + install -D -m 0440 debian/cinder-common.sudoers $(CURDIR)/debian/cinder-common/etc/sudoers.d/cinder-common + + # Set a default value for lock_path & state_path + pkgos-fix-config-default $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf oslo_concurrency lock_path /var/lock/cinder + pkgos-fix-config-default $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf oslo_concurrency state_path /var/lib/cinder + + # Disable https in default setup, as this makes our CI fail + pkgos-fix-config-default $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf keystone_authtoken auth_protocol http + + # Fix the missing sql_connection directive + pkgos-fix-config-default $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf database connection sqlite:////var/lib/cinder/cinderdb + + # Put file under /etc/cinder + install -D -m 0644 $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf $(CURDIR)/debian/cinder-common/etc/cinder/cinder.conf + + # Set LVM as default backend + pkgos-fix-config-default $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf DEFAULT enabled_backends lvm + echo "[lvm]" >> $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf + echo "volume_driver = cinder.volume.drivers.lvm.LVMVolumeDriver" >> $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf + echo "volume_group = pkgosvg0" >> $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf + echo "iscsi_protocol = iscsi" >> $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf + echo "iscsi_helper = tgtadm" >> $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf + + install -D -m 0644 $(CURDIR)/etc/cinder/logging_sample.conf $(CURDIR)/debian/cinder-common/usr/share/cinder-common/logging.conf + +override_dh_fixperms: + dh_fixperms -Xcinder_tgt.conf + chmod 0440 $(CURDIR)/debian/cinder-common/etc/sudoers.d/cinder-common + +override_dh_auto_build: + dh_auto_build -O--buildsystem=python_distutils + + /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func cinder-common.postinst + /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func cinder-volume.postinst + +override_dh_sphinxdoc: +ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS))) + python setup.py build_sphinx + cp -rf doc/build/html $(CURDIR)/debian/cinder-doc/usr/share/doc/cinder-doc + dh_sphinxdoc -O--buildsystem=python_distutils +endif diff --git a/xenial/debian/source/format b/xenial/debian/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/xenial/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/xenial/debian/watch b/xenial/debian/watch new file mode 100644 index 000000000..9a5870436 --- /dev/null +++ b/xenial/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts="uversionmangle=s/\.(b|rc)/~$1/" \ +https://github.com/openstack/cinder/tags .*/(\d[\d\.]+)\.tar\.gz -- 2.32.3