diff --git a/debian/changelog b/debian/changelog index 40d6dce57..5e1d34a20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +cinder (2:7.0.0~b2-2) experimental; urgency=medium + + * Align with MOS packaging: + - Bumped EPOCH to 2 instead of 1. + - Some Ubuntu version lower bounds for dependencies. + - Added a cinder-doc package. + + -- Thomas Goirand Tue, 01 Sep 2015 13:56:21 +0200 + cinder (1:7.0.0~b2-1) experimental; urgency=medium * New upstream release. diff --git a/debian/cinder-api.init.in b/debian/cinder-api.init.in index d3a21a925..1f715f6e8 100644 --- a/debian/cinder-api.init.in +++ b/debian/cinder-api.init.in @@ -13,7 +13,6 @@ ### END INIT INFO # Author: Thomas Goirand - DESC="OpenStack Cinder Api" PROJECT_NAME=cinder NAME=${PROJECT_NAME}-api diff --git a/debian/cinder-api.postinst.in b/debian/cinder-api.postinst.in index 424e0cb9b..ff22918c6 100644 --- a/debian/cinder-api.postinst.in +++ b/debian/cinder-api.postinst.in @@ -4,7 +4,7 @@ set -e #PKGOS-INCLUDE# -if [ "$1" = "configure" ] ; then +if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then . /usr/share/debconf/confmodule pkgos_register_endpoint_postinst cinder cinder volume "Cinder Volume Service" 8776 /v1/'%(tenant_id)s' db_stop diff --git a/debian/cinder-backup.init.in b/debian/cinder-backup.init.in index a57c7443d..22c56ddaf 100644 --- a/debian/cinder-backup.init.in +++ b/debian/cinder-backup.init.in @@ -12,7 +12,6 @@ ### END INIT INFO # Author: Thomas Goirand - DESC="OpenStack Cinder Backup" PROJECT_NAME=cinder NAME=${PROJECT_NAME}-backup diff --git a/debian/cinder-common.dirs b/debian/cinder-common.dirs index f622135d1..989ecfa5e 100644 --- a/debian/cinder-common.dirs +++ b/debian/cinder-common.dirs @@ -1,5 +1 @@ -etc/cinder etc/cinder/rootwrap.d -var/lib/cinder -var/log/cinder -var/lib/cinder/volumes diff --git a/debian/cinder-common.postrm b/debian/cinder-common.postrm index 091fa2858..614fc2067 100644 --- a/debian/cinder-common.postrm +++ b/debian/cinder-common.postrm @@ -22,9 +22,11 @@ if [ "$1" = "purge" ] && [ -f /usr/share/debconf/confmodule ] ; then fi rm -f /etc/cinder/cinder.conf /etc/cinder/api-paste.ini /etc/cinder/logging.conf - rmdir --ignore-fail-on-non-empty /etc/cinder + 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/debian/cinder-scheduler.init.in b/debian/cinder-scheduler.init.in index bf531ae3c..486670494 100644 --- a/debian/cinder-scheduler.init.in +++ b/debian/cinder-scheduler.init.in @@ -13,7 +13,6 @@ ### END INIT INFO # Author: Thomas Goirand - DESC="OpenStack Cinder Scheduler" PROJECT_NAME=cinder NAME=${PROJECT_NAME}-scheduler diff --git a/debian/cinder-volume.dirs b/debian/cinder-volume.dirs deleted file mode 100644 index 769913906..000000000 --- a/debian/cinder-volume.dirs +++ /dev/null @@ -1 +0,0 @@ -var/lib/cinder/volumes diff --git a/debian/cinder-volume.init.in b/debian/cinder-volume.init.in index 4134d7bfc..98439f026 100644 --- a/debian/cinder-volume.init.in +++ b/debian/cinder-volume.init.in @@ -13,7 +13,6 @@ ### END INIT INFO # Author: Thomas Goirand - DESC="OpenStack Cinder Volume" PROJECT_NAME=cinder NAME=${PROJECT_NAME}-volume diff --git a/debian/cinder_sudoers b/debian/cinder_sudoers deleted file mode 100644 index ed5d479de..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/control b/debian/control index 7c1830592..0d8e67930 100644 --- a/debian/control +++ b/debian/control @@ -23,7 +23,7 @@ Build-Depends-Indep: python-anyjson, python-fixtures (>= 1.3.1), python-glanceclient (>= 1:0.18.0), python-greenlet, - python-hacking, + python-hacking (>= 0.10.0), python-iso8601, python-keystonemiddleware (>= 2.0.0), python-kombu, @@ -32,7 +32,7 @@ Build-Depends-Indep: python-anyjson, python-mock (>= 1.3), python-mox3, python-mysqldb, - python-netaddr, + python-netaddr (>= 0.7.12), python-novaclient (>= 2:2.22.0), python-os-brick, python-os-testr, @@ -54,8 +54,8 @@ Build-Depends-Indep: python-anyjson, python-oslo.vmware (>= 1.16.0), python-oslosphinx (>= 2.5.0), python-oslotest (>= 1.7.0), - python-osprofiler, - python-paramiko, + python-osprofiler (>= 0.3.0), + python-paramiko (>= 1.13.0), python-paste, python-pastedeploy, python-psutil, @@ -67,9 +67,9 @@ Build-Depends-Indep: python-anyjson, python-routes, python-rtslib-fb, python-six (>= 1.9.0), - python-sqlalchemy, + python-sqlalchemy (>= 0.9.7), python-stevedore (>= 1.5.0), - python-swiftclient, + python-swiftclient (>= 1:2.2.0), python-taskflow (>= 1.16.0), python-tempest-lib (>= 0.6.1), python-testtools (>= 1.4.0), @@ -79,26 +79,27 @@ Build-Depends-Indep: python-anyjson, Standards-Version: 3.9.6 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/cinder.git;a=summary Vcs-Git: git://anonscm.debian.org/openstack/cinder.git -Homepage: http://cinder.openstack.org/ +Homepage: http://github.com/openstack/cinder Package: python-cinder Section: python Architecture: all -Pre-Depends: dpkg (>= 1.15.6~), Depends: python-anyjson, python-babel, python-barbicanclient (>= 3.0.1), + python-ceph, python-crypto, python-eventlet (>= 0.17.4), python-glanceclient (>= 1:0.18.0), python-greenlet, + python-hp3parclient, python-iso8601, python-keystonemiddleware (>= 2.0.0), python-kombu, python-lxml, python-migrate (>= 0.9.6), python-mysqldb, - python-netaddr, + python-netaddr (>= 0.7.12), python-novaclient (>= 2:2.22.0), python-os-brick, python-oslo.concurrency (>= 2.1.0), @@ -117,9 +118,8 @@ Depends: python-anyjson, python-oslo.utils (>= 1.9.0), python-oslo.versionedobjects (>= 0.5.0), python-oslo.vmware (>= 1.16.0), - python-osprofiler, - python-paramiko, - python-passlib, + python-osprofiler (>= 0.3.0), + python-paramiko (>= 1.13.0), python-paste, python-pastedeploy, python-pbr (>= 1.3), @@ -132,9 +132,9 @@ Depends: python-anyjson, python-routes, python-rtslib-fb, python-six (>= 1.9.0), - python-sqlalchemy, + python-sqlalchemy (>= 0.9.7), python-stevedore (>= 1.5.0), - python-swiftclient, + python-swiftclient (>= 1:2.2.0), python-taskflow (>= 1.16.0), python-webob, ${misc:Depends}, @@ -153,7 +153,6 @@ Description: OpenStack block storage system - Python libraries Package: cinder-common Architecture: all -Pre-Depends: dpkg (>= 1.15.6~), Depends: adduser, dbconfig-common, debconf, @@ -177,7 +176,6 @@ Description: OpenStack block storage system - common files Package: cinder-api Architecture: all -Pre-Depends: dpkg (>= 1.15.6~), Depends: adduser, cinder-common (= ${binary:Version}), debconf, @@ -195,16 +193,15 @@ Description: OpenStack block storage system - API server It also has back-end drivers for many hardware and software storage solutions like Ceph, NFS, Net-APP, etc. . - This package contains the API server on which clients will connect. + This package contains the Cinder API server. Package: cinder-volume Architecture: all -Pre-Depends: dpkg (>= 1.15.6~), Depends: adduser, cinder-common (= ${binary:Version}), lvm2, qemu-utils, - tgt (>= 1:1.0.17-1.1~), + tgt, ${misc:Depends}, ${ostack-lsb-base}, ${python:Depends}, @@ -219,11 +216,10 @@ Description: OpenStack block storage system - Volume server It also has back-end drivers for many hardware and software storage solutions like Ceph, NFS, Net-APP, etc. . - This package contains the Volume server which will actually do the storage. + This package contains the Cinder Volume server. Package: cinder-scheduler Architecture: all -Pre-Depends: dpkg (>= 1.15.6~), Depends: cinder-common (= ${binary:Version}), ${misc:Depends}, ${ostack-lsb-base}, @@ -238,11 +234,10 @@ Description: OpenStack block storage system - Scheduler server It also has back-end drivers for many hardware and software storage solutions like Ceph, NFS, Net-APP, etc. . - This package contains the Scheduler server. + This package contains the Cinder Scheduler server. Package: cinder-backup Architecture: all -Pre-Depends: dpkg (>= 1.15.6~), Depends: adduser, cinder-common (= ${binary:Version}), ${misc:Depends}, @@ -259,3 +254,21 @@ Description: OpenStack block storage system - Backup server 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/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/rules b/debian/rules index ae446c47f..2274bccda 100755 --- a/debian/rules +++ b/debian/rules @@ -1,16 +1,15 @@ #!/usr/bin/make -f include /usr/share/openstack-pkg-tools/pkgos.make - -export OSLO_PACKAGE_VERSION=$(shell dpkg-parsechangelog -S Version | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/') +export OSLO_PACKAGE_VERSION=$(shell dpkg-parsechangelog | grep Version: | cut -d' ' -f2 | sed -e 's/^[[:digit:]]*://' -e 's/[-].*//' -e 's/~/.0/' | head -n 1) %: - dh $@ --with python2,systemd + 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 $(PYTHON3S) ; do \ + 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 ; \ @@ -24,12 +23,11 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS))) endif override_dh_clean: - dh_clean + dh_clean -O--buildsystem=python_distutils rm -f debian/cinder-common.config debian/cinder-common.postinst debian/cinder-api.config debian/cinder-api.postinst debian/cinder-volume.postinst rm -rf debian/*.upstart debian/*.service override_dh_install: - #tools/config/generate_sample.sh -b . -p cinder -o etc/cinder dh_install --fail-missing -Xbin/cinder-all install -D -m 0440 debian/cinder-common.sudoers $(CURDIR)/debian/cinder-common/etc/sudoers.d/cinder-common @@ -46,28 +44,39 @@ override_dh_install: --namespace cinder.openstack.common.periodic_task \ --namespace cinder.openstack.common.policy \ --namespace oslo_db.concurrency - - #install -D -m 0644 $(CURDIR)/debian/cinder.conf $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf install -D -m 0644 $(CURDIR)/etc/cinder/cinder.conf.sample $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf # Disable https in default setup, as this makes our CI fail sed -i 's/#auth_protocol=https/auth_protocol=http/' $(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 - sed -i 's|#rootwrap_config=|rootwrap_config=/etc/cinder/rootwrap.conf|' $(CURDIR)/debian/cinder-common/etc/sudoers.d/cinder-common + + # Default to keystone auth + sed -i "s/#auth_strategy=noauth/auth_strategy=keystone/" $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf + + # Write only in /var/lib/cinder please + sed -i 's|#state_path=$pybasedir|state_path=/var/lib/cinder|' $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf + + # Fix the missing sql_connection directive echo "# Connection to db:" >>$(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf echo "sql_connection = sqlite:////var/lib/cinder/cinderdb" >>$(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf - sed -i "s/#auth_strategy=noauth/auth_strategy=keystone/" $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf - sed -i 's|#state_path=$pybasedir|state_path=/var/lib/cinder|' $(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 + dh_auto_build -O--buildsystem=python_distutils /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func cinder-common.config /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func cinder-common.postinst /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func cinder-api.config /usr/share/openstack-pkg-tools/pkgos_insert_include pkgos_func cinder-api.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/debian/ubuntu_control_vars b/debian/ubuntu_control_vars deleted file mode 100644 index e69de29bb..000000000