Update cinder according global requirements

- sync d/control from anonscm.debian.org
- remove obsolete patch

Change-Id: I9a24aae2befd80de9d1c3ded8c3ca090ae6bce58

diff --git a/tests/runtests.sh b/tests/runtests.sh
index 162b145cae3fb0b1a05577d211c57d8a94c3da6a..e71eafe563452262770da2854375520da13b4d8e 100755 (executable)
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -19,8 +19,10 @@ function prepare_vm(){
     echo "mysql-server mysql-server/root_password_again select $MYSQL_PASSWORD" |
       debconf-set-selections
     apt-get install -y mysql-server python-mysqldb rabbitmq-server curl screen nmap
+    CONF_FILE='/usr/share/cinder-common/cinder.conf'
   else
     yum install -y mysql-server mysql-wsrep-client-5.6 MySQL-python nmap-ncat
+    CONF_FILE='/usr/share/cinder/cinder-dist.conf'
     # workaround for `sqlalchemy.exc.OperationalError: (_mysql_exceptions.OperationalError)
     # (2002, "Can't connect to local MySQL server through socket '/var/lib/mysql/mysql.sock' (2)")`
     rm -f /etc/my.cnf
@@ -33,7 +35,7 @@ CREATE DATABASE cinder;
 CREATE USER 'cinder'@'localhost' IDENTIFIED BY '$MYSQL_PASSWORD';
 GRANT ALL PRIVILEGES ON *.* TO 'cinder'@'localhost';
 MYSQL_SCRIPT
-  cinder-manage --config-file /usr/share/cinder/cinder-dist.conf db sync
+  cinder-manage --config-file $CONF_FILE db sync
 }
 
 
@@ -45,7 +47,7 @@ function test_cinder_service(){
   service "$service" start
 
   sleep 5
-  echo | ncat -w 5 localhost "$port"
+  echo | ncat -w 5 127.0.0.1 "$port"
   local ec=$?
   update_ec "$ec"
 
@@ -96,11 +98,9 @@ case $1 in
     [ -f "/usr/bin/cinder-scheduler" ] ; update_ec "$?"
   ;;
   cinder-api)
-    EC=0
-    # Should be fixed with next update of Ubuntu package.  
-    # prepare_vm
-    # [ -f "/usr/bin/cinder-api" ] ; update_ec "$?"
-    # test_cinder_service cinder-api 8776 ; update_ec "$?"
+    prepare_vm
+    [ -f "/usr/bin/cinder-api" ] ; update_ec "$?"
+    test_cinder_service cinder-api 8776 ; update_ec "$?"
   ;;
   cinder-volume)
     [ -f "/usr/bin/cinder-volume" ] ; update_ec "$?"

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 868fe37df940502ec59b9040813ffc9da0bde8bb..08e8d56547996649ad21945d20beca984ae7341c 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,3 +1,37 @@
+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 <mivanov@mirantis.com>  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 <zigo@debian.org>  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 <zigo@debian.org>  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

diff --git a/trusty/debian/control b/trusty/debian/control
index 027dd3944879c44e74c289db5cff8380e0dca5ea..673f330401a7efae10dd8ddfa26e748d34ddbf89 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -4,29 +4,32 @@ Priority: extra
 Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
 Uploaders: Thomas Goirand <zigo@debian.org>,
 Build-Depends: debhelper (>= 9),
-               git,
                dh-python,
                dh-systemd,
-               openstack-pkg-tools (>= 23~),
+               openstack-pkg-tools (>= 38~),
                po-debconf,
                python-all,
                python-pbr (>= 1.8),
                python-setuptools,
                python-sphinx,
 Build-Depends-Indep: bandit (>= 0.13.2),
+                     git,
                      python-anyjson,
                      python-babel,
                      python-barbicanclient (>= 3.3.0),
                      python-coverage,
                      python-crypto,
+                     python-decorator (>= 3.4.0),
                      python-ddt (>= 1.0.1),
                      python-enum34,
-                     python-eventlet (>= 0.17.4),
+                     python-eventlet (>= 0.18.4),
                      python-fixtures (>= 1.3.1),
                      python-glanceclient (>= 1:1.2.0),
+                     python-googleapi (>= 1.4.2),
                      python-greenlet,
-                     python-hacking (>= 0.10.2),
+                     python-hacking (>= 0.10.0),
                      python-iso8601,
+                     python-keystoneclient (>= 1:1.6.0),
                      python-keystonemiddleware (>= 4.0.0),
                      python-lxml,
                      python-migrate (>= 0.9.6),
@@ -34,28 +37,29 @@ Build-Depends-Indep: bandit (>= 0.13.2),
                      python-mox3,
                      python-mysqldb,
                      python-novaclient (>= 2:2.29.0),
-                     python-os-brick (>= 0.4.0),
+                     python-oauth2client (>= 1.4.12),
+                     python-os-brick (>= 1.0.0),
                      python-os-testr (>= 0.4.2),
-                     python-os-win,
-                     python-oslo.concurrency (>= 2.3.0),
-                     python-oslo.config (>= 1:3.2.0),
+                     python-os-win (>= 0.2.1),
+                     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 (>= 1.5.0),
+                     python-oslo.i18n (>= 2.1.0),
                      python-oslo.log (>= 2.0.0),
-                     python-oslo.messaging (>= 3.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.4.0),
-                     python-oslo.versionedobjects (>= 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 (>= 0.3.0),
+                     python-osprofiler (>= 1.1.0),
                      python-paramiko (>= 1.13.0),
                      python-paste,
                      python-pastedeploy,
@@ -67,61 +71,66 @@ Build-Depends-Indep: bandit (>= 0.13.2),
                      python-retrying,
                      python-routes,
                      python-rtslib-fb (>= 2.1.57),
+                     python-simplejson,
                      python-six (>= 1.9.0),
                      python-sqlalchemy (>= 1.0.10),
                      python-stevedore (>= 1.5.0),
                      python-swiftclient (>= 1:2.2.0),
-                     python-taskflow (>= 1.25.0),
-                     python-tempest-lib (>= 0.13.0),
+                     python-taskflow (>= 1.26.0),
+                     python-tempest-lib (>= 0.14.0),
                      python-testresources,
                      python-testscenarios,
                      python-testtools (>= 1.4.0),
-                     python-tooz,
+                     python-tooz (>= 1.28.0),
+                     python-tz,
                      python-webob,
                      subunit,
                      testrepository,
 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://github.com/openstack/cinder
+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-anyjson,
-         python-babel,
+Depends: python-babel,
          python-barbicanclient (>= 3.3.0),
          python-ceph,
          python-crypto,
-         python-eventlet (>= 0.17.4),
+         python-decorator (>= 3.4.0),
+         python-eventlet (>= 0.18.4),
          python-glanceclient (>= 1:1.2.0),
+         python-googleapi (>= 1.4.2),
          python-greenlet,
          python-hp3parclient,
          python-iso8601,
+         python-keystoneclient (>= 1:1.6.0),
          python-keystonemiddleware (>= 4.0.0),
          python-lxml,
          python-migrate (>= 0.9.6),
          python-mysqldb,
          python-novaclient (>= 2:2.29.0),
-         python-os-brick (>= 0.4.0),
-         python-os-win,
-         python-oslo.concurrency (>= 2.3.0),
-         python-oslo.config (>= 1:3.2.0),
+         python-oauth2client (>= 1.4.12),
+         python-os-brick (>= 1.0.0),
+         python-os-win (>= 0.2.1),
+         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 (>= 1.5.0),
+         python-oslo.i18n (>= 2.1.0),
          python-oslo.log (>= 2.0.0),
-         python-oslo.messaging (>= 3.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.4.0),
-         python-oslo.versionedobjects (>= 1.0.0),
+         python-oslo.utils (>= 3.5.0),
+         python-oslo.versionedobjects (>= 1.5.0),
          python-oslo.vmware (>= 1.16.0),
-         python-osprofiler (>= 0.3.0),
+         python-osprofiler (>= 1.1.0),
          python-paramiko (>= 1.13.0),
          python-paste,
          python-pastedeploy,
@@ -134,12 +143,17 @@ Depends: python-anyjson,
          python-retrying,
          python-routes,
          python-rtslib-fb (>= 2.1.57),
+         python-simplejson,
          python-six (>= 1.9.0),
          python-sqlalchemy (>= 1.0.10),
          python-stevedore (>= 1.5.0),
          python-swiftclient (>= 1:2.2.0),
-         python-taskflow (>= 1.25.0),
+         python-taskflow (>= 1.26.0),
+         python-tooz (>= 1.28.0),
+         python-tz,
          python-webob,
+         ${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

diff --git a/trusty/debian/patches/install-missing-files.patch b/trusty/debian/patches/install-missing-files.patch
deleted file mode 100644 (file)
index 160e50a..0000000
--- a/trusty/debian/patches/install-missing-files.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: Install some missing files
-Author: Mehdi Abaakouk <sileht@sileht.net>
-
---- a/MANIFEST.in
-+++ b/MANIFEST.in
-@@ -4,3 +4,33 @@
- exclude .gitreview
- 
- global-exclude *.pyc
-+include cinder/api/openstack/volume/schemas/atom-link.rng
-+include cinder/api/openstack/volume/schemas/v1.1/extension.rng
-+include cinder/api/openstack/volume/schemas/v1.1/extensions.rng
-+include cinder/api/openstack/volume/schemas/v1.1/limits.rng
-+include cinder/api/openstack/volume/schemas/v1.1/metadata.rng
-+include cinder/db/sqlalchemy/migrate_repo/README
-+include cinder/db/sqlalchemy/migrate_repo/migrate.cfg
-+include cinder/locale/bs/LC_MESSAGES/cinder.po
-+include cinder/locale/cinder.pot
-+include cinder/locale/cs/LC_MESSAGES/cinder.po
-+include cinder/locale/da/LC_MESSAGES/cinder.po
-+include cinder/locale/de/LC_MESSAGES/cinder.po
-+include cinder/locale/en_AU/LC_MESSAGES/cinder.po
-+include cinder/locale/en_GB/LC_MESSAGES/cinder.po
-+include cinder/locale/es/LC_MESSAGES/cinder.po
-+include cinder/locale/fr/LC_MESSAGES/cinder.po
-+include cinder/locale/it/LC_MESSAGES/cinder.po
-+include cinder/locale/ja/LC_MESSAGES/cinder.po
-+include cinder/locale/ko/LC_MESSAGES/cinder.po
-+include cinder/locale/pt_BR/LC_MESSAGES/cinder.po
-+include cinder/locale/ru/LC_MESSAGES/cinder.po
-+include cinder/locale/tl/LC_MESSAGES/cinder.po
-+include cinder/locale/tr/LC_MESSAGES/cinder.po
-+include cinder/locale/uk/LC_MESSAGES/cinder.po
-+include cinder/locale/zh_CN/LC_MESSAGES/cinder.po
-+include cinder/locale/zh_TW/LC_MESSAGES/cinder.po
-+include cinder/openstack/common/README
-+include cinder/testing/README.rst
-+include cinder/tests/policy.json
-+include cinder/tests/test_migrations.conf

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index 25c0f244e6c3528dd5e85c9e11d2537f261ba6ad..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -1 +0,0 @@
-install-missing-files.patch