[MCP 1.1] Update cinder packages

Version: 2:10.0.0

* Sync changes. (CR#34850)
* d/rules: Do not exclude cinder-all as it is not generated
    anymore.
* Downgrade version due to the fact, that CR#34966 was not
  merged.

Change-Id: I6d98985f3d2d60153d31478ba7e9544f596081bb
Downgrade-due: CR#34966 was not merged.

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index a2fed07964102c158159fbec6098e98e9b125ef8..a79ccafc210453deb76531d20c7c80c91985fbc0 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,13 @@
+cinder (2:10.0.0-1~u16.04+mcp0) mcp; urgency=medium
+
+  * Sync changes. (CR#34850)
+  * d/rules: Do not exclude cinder-all as it is not generated
+      anymore.
+  * Downgrade version due to the fact, that CR#34966 was not
+    merged.
+
+ -- Ivan Udovichenko <mos-linux@mirantis.com>  Thu, 27 Apr 2017 18:18:23 +0300
+
 cinder (2:10.0.1-1~u16.04+mcp0) mcp; urgency=medium
 
   * Bump up Cinder version. (CR#34966)

diff --git a/xenial/debian/control b/xenial/debian/control
index f570ab956aa061e36eab30df4ef67905b6405628..48924c19a642e2162e651040be38d497e87420b5 100644 (file)
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@ -66,6 +66,7 @@ Build-Depends-Indep: python-babel (>= 2.3.4),
                      python-paste,
                      python-pastedeploy (>= 1.5.0),
                      python-pep8,
+                     python-psutil,
                      python-psycopg2 (>= 2.5),
                      python-crypto (>= 2.6),
                      python-pyparsing (>= 2.1.0),
@@ -82,7 +83,7 @@ Build-Depends-Indep: python-babel (>= 2.3.4),
                      python-suds (>= 0.6),
                      python-swiftclient (>= 1:3.2.0),
                      python-taskflow (>= 2.7.0),
-#                     python-tempest (>= 1:12.1.0),
+                     python-tempest (>= 1:12.1.0),
                      python-testrepository (>= 0.0.18),
                      python-testresources (>= 0.2.4),
                      python-testscenarios (>= 0.4),
@@ -138,6 +139,7 @@ Depends: python-babel (>= 2.3.4),
          python-paramiko (>= 2.0),
          python-paste,
          python-pastedeploy (>= 1.5.0),
+         python-psutil,
          python-pyparsing (>= 2.1.0),
          python-rtslib-fb (>= 2.1.43),
          python-tz (>= 2013.6),

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 3ec41693415459481540b3ed472cc8edd9c97c1e..fb44bbed42852aae3d3796adc7315cbfdfe96404 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -21,7 +21,7 @@ override_dh_auto_test:
 endif
 
 override_dh_install:
-       dh_install --fail-missing -Xbin/cinder-all -Xusr/bin/cinder-api
+       dh_install --fail-missing -Xusr/bin/cinder-api
 
 override_dh_fixperms:
        dh_fixperms -Xcinder_tgt.conf