[MOS10.0][DEB] Update cinder to v9.0.0

  * Source from https://review.openstack.org/#/admin/projects/openstack/deb-cinder
  commit  ab9518112137f3141739e873b19cdc0085963bc7
  * Fix (build-)dependencies.
  * d/patches:
    -- delete temp-sql-fix.patch

Change-Id: Ie31cfe67bf60466fd014ff2592bc10c22b456114

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index d879b1440d7dcb0e081c1620b02393a83464efbc..7249d84ee75366c6f1e25700434aa00e2f00e194 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,49 @@
+cinder (2:9.0.0-1~u16.04+mos1) mos10.0; urgency=medium
+
+  * Source from https://review.openstack.org/#/admin/projects/openstack/deb-cinder
+  commit  ab9518112137f3141739e873b19cdc0085963bc7
+  * Fix (build-)dependencies.
+  * d/patches:
+    -- delete temp-sql-fix.patch
+
+ -- Andrii Kroshchenko <akroshchenko@mirantis.com>  Tue, 11 Oct 2016 15:46:20 +0300
+
+cinder (2:9.0.0-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 06 Oct 2016 17:32:42 +0200
+
+cinder (2:9.0.0~rc1-2) unstable; urgency=medium
+
+  [ Ondřej Nový ]
+  * d/s/options: extend-diff-ignore of .gitreview
+  * d/control: Use correct branch in Vcs-* fields
+
+  [ Thomas Goirand ]
+  * Uploading to unstable.
+  * Build-Depends on openstack-pkg-tools >= 53~.
+  * Fixed oslotest EPOCH.
+  * Debconf translation:
+    - it (Closes: #839197).
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 28 Sep 2016 09:38:45 +0200
+
+cinder (2:9.0.0~rc1-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Fixed (build-)depends for this release.
+  * Fixed namespace list when generating cinder.conf.
+  * Using OpenStack's Gerrit as VCS URLs.
+  * Rebased nozfs patches.
+  * Added PYTHONPATH=. when building sphinx doc.
+  * Black list 3 unit tests that non-deterministically fail:
+    - test_volume.VolumeMigrationTestCase.test_retype_volume_migration_failed
+    - test_volume.VolumeMigrationTestCase.test_retype_volume_migration_bad_policy
+    - backup.test_backup.BackupTestCase.test_create_backup_with_temp_snapshot
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 14 Sep 2016 21:17:08 +0200
+
 cinder (2:9.0.0~b2-2~u16.04+mos1) mos10.0; urgency=medium
 
   * Add patch https://review.openstack.org/#/c/355837

diff --git a/xenial/debian/control b/xenial/debian/control
index 01f41729437a424649a11f66479593e5dd3519cc..4f671b034d9ba88c7b1dfdf671659a97e57ae6a6 100644 (file)
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@ -6,7 +6,7 @@ Uploaders: Thomas Goirand <zigo@debian.org>,
 Build-Depends: debhelper (>= 9),
                dh-python,
                dh-systemd,
-               openstack-pkg-tools (>= 50~),
+               openstack-pkg-tools (>= 53~),
                po-debconf,
                python-all,
                python-pbr (>= 1.8),
@@ -14,17 +14,18 @@ Build-Depends: debhelper (>= 9),
                python-sphinx (>= 1.2.1),
 Build-Depends-Indep: bandit (>= 0.13.2),
                      git,
-                     python-anyjson,
+                     python-anyjson (>= 0.3.3),
                      python-babel (>= 2.3.4),
                      python-barbicanclient (>= 4.0.0),
-                     python-coverage,
+                     python-castellan (>= 0.4.0),
+                     python-coverage (>= 3.6),
                      python-crypto (>= 2.6),
-                     python-decorator (>= 3.4.0),
                      python-ddt (>= 1.0.1),
+                     python-decorator (>= 3.4.0),
                      python-enum34,
                      python-eventlet (>= 0.18.4),
                      python-fixtures (>= 3.0.0),
-                     python-glanceclient (>= 1:2.0.0),
+                     python-glanceclient (>= 1:2.3.0),
                      python-googleapi (>= 1.4.2),
                      python-greenlet (>= 0.3.2),
                      python-hacking (>= 0.10.0),
@@ -32,28 +33,28 @@ Build-Depends-Indep: bandit (>= 0.13.2),
                      python-ipaddress (>= 1.0.7),
                      python-iso8601 (>= 0.1.11),
                      python-keystoneauth1 (>= 2.10.0),
-                     python-keystoneclient (>= 1:1.7.0),
+                     python-keystoneclient (>= 1:2.0.0),
                      python-keystonemiddleware (>= 4.0.0),
                      python-lxml (>= 2.3),
                      python-migrate (>= 0.9.6),
                      python-mock (>= 2.0),
-                     python-mox3,
+                     python-mox3 (>= 0.7.0),
                      python-mysqldb,
                      python-novaclient (>= 2:2.29.0),
                      python-oauth2client (>= 2.0.1),
-                     python-os-brick (>= 1.3.0),
+                     python-os-brick (>= 1.6.1),
                      python-os-testr (>= 0.7.0),
                      python-os-win (>= 0.2.3),
                      python-oslo.concurrency (>= 3.8.0),
                      python-oslo.config (>= 1:3.14.0),
-                     python-oslo.context (>= 2.4.0),
-                     python-oslo.db (>= 4.1.0),
+                     python-oslo.context (>= 2.9.0),
+                     python-oslo.db (>= 4.10.0),
                      python-oslo.i18n (>= 2.1.0),
                      python-oslo.log (>= 2.0.0),
                      python-oslo.messaging (>= 5.2.0),
                      python-oslo.middleware (>= 3.0.0),
+                     python-oslo.privsep (>= 1.9.0),
                      python-oslo.policy (>= 1.9.0),
-                     python-oslo.privsep,
                      python-oslo.reports (>= 1.0.0),
                      python-oslo.rootwrap (>= 5.0.0),
                      python-oslo.serialization (>= 2.0.0),
@@ -62,11 +63,12 @@ Build-Depends-Indep: bandit (>= 0.13.2),
                      python-oslo.versionedobjects (>= 1.13.0),
                      python-oslo.vmware (>= 2.11.0),
                      python-oslosphinx (>= 2.5.0),
-                     python-oslotest (>= 1.10.0),
-                     python-osprofiler (>= 1.3.0),
-                     python-paramiko (>= 2.0),
+                     python-oslotest (>= 1:1.10.0),
+                     python-osprofiler (>= 1.4.0),
+                     python-paramiko (>= 2.0.0),
                      python-paste,
                      python-pastedeploy (>= 1.5.0),
+                     python-pep8,
                      python-psutil,
                      python-psycopg2 (>= 2.5),
                      python-pymysql,
@@ -83,19 +85,17 @@ Build-Depends-Indep: bandit (>= 0.13.2),
                      python-swiftclient (>= 1:2.2.0),
                      python-taskflow (>= 1.26.0),
                      python-tempest-lib (>= 0.14.0),
-                     python-testresources,
-                     python-testscenarios,
+                     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,
-                     python-oslo.privsep,
-                     python-suds (>= 0.6),
 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
+Vcs-Browser: https://git.openstack.org/cgit/openstack/deb-cinder?h=debian%2Fnewton
+Vcs-Git: https://git.openstack.org/openstack/deb-cinder -b debian/newton
 Homepage: https://github.com/openstack/cinder
 
 Package: python-cinder
@@ -103,46 +103,47 @@ Section: python
 Architecture: all
 Depends: python-babel (>= 2.3.4),
          python-barbicanclient (>= 4.0.0),
+         python-castellan (>= 0.4.0),
          python-ceph,
          python-crypto (>= 2.6),
          python-decorator (>= 3.4.0),
          python-eventlet (>= 0.18.4),
-         python-glanceclient (>= 1:2.0.0),
+         python-glanceclient (>= 1:2.3.0),
          python-googleapi (>= 1.4.2),
          python-greenlet (>= 0.3.2),
-         python-httplib2 (>= 0.7.5),
          python-hp3parclient,
+         python-httplib2 (>= 0.7.5),
          python-ipaddress (>= 1.0.7),
          python-iso8601 (>= 0.1.11),
          python-keystoneauth1 (>= 2.10.0),
-         python-keystoneclient (>= 1:1.7.0),
+         python-keystoneclient (>= 1:2.0.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 (>= 2.0.1),
-         python-os-brick (>= 1.3.0),
+         python-os-brick (>= 1.6.1),
          python-os-win (>= 0.2.3),
          python-oslo.concurrency (>= 3.8.0),
          python-oslo.config (>= 1:3.14.0),
-         python-oslo.context (>= 2.4.0),
-         python-oslo.db (>= 4.1.0),
+         python-oslo.context (>= 2.9.0),
+         python-oslo.db (>= 4.10.0),
          python-oslo.i18n (>= 2.1.0),
          python-oslo.log (>= 2.0.0),
          python-oslo.messaging (>= 5.2.0),
          python-oslo.middleware (>= 3.0.0),
          python-oslo.policy (>= 1.9.0),
+         python-oslo.privsep (>= 1.9.0),
          python-oslo.reports (>= 1.0.0),
-         python-oslo.privsep,
          python-oslo.rootwrap (>= 5.0.0),
          python-oslo.serialization (>= 2.0.0),
          python-oslo.service (>= 1.10.0),
          python-oslo.utils (>= 3.16.0),
          python-oslo.versionedobjects (>= 1.13.0),
          python-oslo.vmware (>= 2.11.0),
-         python-osprofiler (>= 1.3.0),
-         python-paramiko (>= 2.0),
+         python-osprofiler (>= 1.4.0),
+         python-paramiko (>= 2.0.0),
          python-paste,
          python-pastedeploy (>= 1.5.0),
          python-pbr (>= 1.8),
@@ -205,7 +206,7 @@ Architecture: all
 Depends: adduser,
          cinder-common (= ${binary:Version}),
          debconf,
-         python-keystoneclient (>= 1.7.0),
+         python-keystoneclient (>= 2.0.0),
          python-openstackclient,
          q-text-as-data,
          ${misc:Depends},

diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series
index 513c9fdfb8401734784ef15c1a250ba88845678d..25c0f244e6c3528dd5e85c9e11d2537f261ba6ad 100644 (file)
--- a/xenial/debian/patches/series
+++ b/xenial/debian/patches/series
@@ -1,2 +1 @@
-temp-sql-fix.patch
 install-missing-files.patch

diff --git a/xenial/debian/patches/temp-sql-fix.patch b/xenial/debian/patches/temp-sql-fix.patch
deleted file mode 100644 (file)
index c540c42..0000000
--- a/xenial/debian/patches/temp-sql-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- /usr/lib/python2.7/dist-packages/cinder/db/sqlalchemy/api.py       2016-08-15 20:22:13.000000000 +0000
-+++ b/cinder/db/sqlalchemy/api.py      2016-08-17 09:21:49.720954120 +0000
-@@ -396,9 +396,10 @@
-             match_level = 'host'
-
-     # Mysql is not doing case sensitive filtering, so we force it
--    if CONF.database.connection.startswith('mysql:'):
-+    conn_str = CONF.database.connection
-+    if conn_str.startswith('mysql') and conn_str[5] in ['+', ':']:
-         cmp_value = func.binary(value)
--        like_op = 'LIKE_BINARY'
-+        like_op = 'LIKE BINARY'
-     else:
-         cmp_value = value
-         like_op = 'LIKE'

diff --git a/xenial/debian/po/it.po b/xenial/debian/po/it.po
index 3d231970997ffd083c2f2e051368c620569eeace..64690cab96a4d305ea13b762a9301b323b171464 100644 (file)
--- a/xenial/debian/po/it.po
+++ b/xenial/debian/po/it.po
@@ -1,13 +1,13 @@
 # Italian translation of cinder debconf messages
-# Copyright (C) 2014, cinder package's copyright holder
+# Copyright (C) 2016, cinder package's copyright holder
 # This file is distributed under the same license as the cinder package.
-# Beatrice Torracca <beatricet@libero.it>, 2013, 2014.
+# Beatrice Torracca <beatricet@libero.it>, 2013, 2014, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: cinder\n"
 "Report-Msgid-Bugs-To: cinder@packages.debian.org\n"
 "POT-Creation-Date: 2016-03-29 12:24+0000\n"
-"PO-Revision-Date: 2014-04-06 15:15+0200\n"
+"PO-Revision-Date: 2016-09-30 07:25+0200\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
 "Language: it\n"
@@ -253,10 +253,9 @@ msgstr ""
 #. Type: string
 #. Description
 #: ../cinder-api.templates:4001
-#, fuzzy
 #| msgid "Keystone authentication token:"
 msgid "Keystone admin name:"
-msgstr "Token di autenticazione Keystone:"
+msgstr "Nome amministratore Keystone:"
 
 #. Type: string
 #. Description
@@ -270,18 +269,21 @@ msgid ""
 "To register the service endpoint, this package needs to know the Admin "
 "login, name, project name, and password to the Keystone server."
 msgstr ""
+"Per registrare il punto terminale del servizio questo pacchetto deve "
+"conoscere il login, il nome, il nome del progetto e la password "
+"dell'amministratore per il server Keystone."
 
 #. Type: string
 #. Description
 #: ../cinder-api.templates:5001
 msgid "Keystone admin project name:"
-msgstr ""
+msgstr "Nome del progetto di amministrazione Keystone:"
 
 #. Type: password
 #. Description
 #: ../cinder-api.templates:6001
 msgid "Keystone admin password:"
-msgstr ""
+msgstr "Password amministratore Keystone:"
 
 #. Type: string
 #. Description
@@ -326,18 +328,3 @@ msgstr ""
 "OpenStack può essere usato utilizzando le zone di disponibilità, con ogni "
 "regione che rappresenta una posizione. Inserire la zona che si desidera "
 "usare durante la registrazione del punto terminale."
-
-#~ msgid ""
-#~ "To configure its endpoint in Keystone, cinder-api needs the Keystone "
-#~ "authentication token."
-#~ msgstr ""
-#~ "Per configurare il proprio punto terminale in Keystone, cinder-api ha "
-#~ "bisogno del token di autenticazione Keystone."
-
-#~ msgid "Start Cinder services at boot?"
-#~ msgstr "Far partire i servizi cinder all'avvio?"
-
-#~ msgid ""
-#~ "Please choose whether you want to start Cinder services when the machine "
-#~ "is booted up."
-#~ msgstr "Scegliere se far partire i servizi Cinder all'avvio della macchina."

diff --git a/xenial/debian/rules b/xenial/debian/rules
index c2d613bd4e33c9aa49df11bc54b3fcf8fae6514c..e475ffa5b841b56c66b930fafb44979898d72efe 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -14,7 +14,7 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
                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.*|.*test_volume\.ConsistencyGroupTestCase\.test_create_delete_cgsnapshot.*|.*test_volume\.VolumeMigrationTestCase\.test_retype_volume_driver_success.*))' | tee $$TEMP_REZ | subunit2pyunit ; \
+               PYTHONPATH=$(CURDIR) PYTHON=python$$i testr-python$$PYMAJOR run --subunit 'cinder\.tests\.unit\.(?!(.*test_volume\.VolumeTestCase\.test_create_delete_volume.*|.*test_volume\.ConsistencyGroupTestCase\.test_create_delete_cgsnapshot.*|.*test_volume\.VolumeMigrationTestCase\.test_retype_volume_driver_success.*|.*test_volume\.VolumeMigrationTestCase\.test_retype_volume_migration_failed.*|.*backup\.test_backup\.BackupTestCase\.test_create_backup_with_temp_snapshot.*|.*test_volume\.VolumeMigrationTestCase\.test_retype_volume_migration_bad_policy.*))' | tee $$TEMP_REZ | subunit2pyunit ; \
                cat $$TEMP_REZ | subunit-filter -s --no-passthrough | subunit-stats ; \
                rm -f $$TEMP_REZ ; \
                testr-python$$PYMAJOR slowest ; \
@@ -39,6 +39,7 @@ override_dh_install:
        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 castellan.config \
                --namespace cinder \
                --namespace keystonemiddleware.auth_token \
                --namespace oslo.config \
@@ -86,9 +87,6 @@ override_dh_install:
        # Fix the missing sql_connection directive
        pkgos-fix-config-default $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf database 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
-
        install -D -m 0644 $(CURDIR)/etc/cinder/logging_sample.conf $(CURDIR)/debian/cinder-common/usr/share/cinder-common/logging.conf
 
 override_dh_fixperms:
@@ -106,7 +104,7 @@ override_dh_auto_build:
 
 override_dh_sphinxdoc:
 ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
-       PYTHONPATH=$(CURDIR) python setup.py build_sphinx
+       PYTHONPATH=. 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/options b/xenial/debian/source/options
new file mode 100644 (file)
index 0000000..001062d
--- /dev/null
+++ b/xenial/debian/source/options
@@ -0,0 +1 @@
+extend-diff-ignore = "^[.]gitreview$"