diff -Nru python-os-brick-1.10.0/ChangeLog python-os-brick-1.11.0/ChangeLog --- python-os-brick-1.10.0/ChangeLog 2017-01-19 18:43:23.000000000 +0000 +++ python-os-brick-1.11.0/ChangeLog 2017-01-25 02:22:47.000000000 +0000 @@ -1,6 +1,12 @@ CHANGES ======= +1.11.0 +------ + +* Updated from global requirements +* Encryptors: Fix compat with Nova encryptors for Ocata + 1.10.0 ------ diff -Nru python-os-brick-1.10.0/debian/changelog python-os-brick-1.11.0/debian/changelog --- python-os-brick-1.10.0/debian/changelog 2017-01-20 14:53:50.000000000 +0000 +++ python-os-brick-1.11.0/debian/changelog 2017-01-25 14:20:47.000000000 +0000 @@ -1,3 +1,10 @@ +python-os-brick (1.11.0-0ubuntu1) zesty; urgency=medium + + * New upstream release. + * debian/control: Bump version dependencies + + -- Chuck Short Wed, 25 Jan 2017 09:20:47 -0500 + python-os-brick (1.10.0-0ubuntu1) zesty; urgency=medium * New upstream release. diff -Nru python-os-brick-1.10.0/debian/control python-os-brick-1.11.0/debian/control --- python-os-brick-1.10.0/debian/control 2017-01-20 14:53:50.000000000 +0000 +++ python-os-brick-1.11.0/debian/control 2017-01-25 14:20:47.000000000 +0000 @@ -22,7 +22,7 @@ python-eventlet (>= 0.18.2), python-hacking (>= 0.10.0), python-os-testr (>= 0.8.0), - python-os-win (>= 1.3.0), + python-os-win (>= 1.4.0), python-oslo.concurrency (>= 3.8.0), python-oslo.i18n (>= 2.1.0), python-oslo.log (>= 3.11.0), @@ -30,20 +30,24 @@ python-oslo.serialization (>= 1.10.0), python-oslo.service (>= 1.10.0), python-oslo.utils (>= 3.18.0), - python-oslo.vmware (>= 2.15.0), + python-oslo.vmware (>= 2.17.0), python-oslosphinx (>= 4.7.0), python-oslotest (>= 1.10.0), python-requests (>= 2.10.0), python-retrying (>= 1.2.3), python-six (>= 1.9.0), + python-sphinx (>= 1.2.1), + python-testrepository (>= 0.0.18), python-testscenarios (>= 0.4), python-testtools (>= 1.4.0), python3-babel (>= 2.3.4), python3-castellan (>= 0.4.0), + python3-coverage (>= 4.0), python3-ddt (>= 1.0.1), python3-eventlet (>= 0.18.2), + python3-hacking (>= 0.10.0), python3-os-testr (>= 0.8.0), - python3-os-win (>= 1.3.0), + python3-os-win (>= 1.4.0), python3-oslo.concurrency (>= 3.8.0), python3-oslo.i18n (>= 2.1.0), python3-oslo.log (>= 3.11.0), @@ -51,11 +55,14 @@ python3-oslo.serialization (>= 1.10.0), python3-oslo.service (>= 1.10.0), python3-oslo.utils (>= 3.18.0), - python3-oslo.vmware (>= 2.15.0), + python3-oslo.vmware (>= 2.17.0), + python3-oslosphinx (>= 4.7.0), python3-oslotest (>= 1.10.0), python3-requests (>= 2.10.0), python3-retrying (>= 1.2.3), python3-six (>= 1.9.0), + python3-sphinx (>= 1.2.1), + python3-testrepository (>= 0.0.18), python3-testscenarios (>= 0.4), python3-testtools (>= 1.4.0), subunit, diff -Nru python-os-brick-1.10.0/os_brick/encryptors/__init__.py python-os-brick-1.11.0/os_brick/encryptors/__init__.py --- python-os-brick-1.10.0/os_brick/encryptors/__init__.py 2017-01-19 18:42:45.000000000 +0000 +++ python-os-brick-1.11.0/os_brick/encryptors/__init__.py 2017-01-25 02:21:35.000000000 +0000 @@ -31,6 +31,9 @@ } LEGACY_PROVIDER_CLASS_TO_FORMAT_MAP = { + "nova.volume.encryptors.luks.LuksEncryptor": LUKS, + "nova.volume.encryptors.cryptsetup.CryptsetupEncryptor": PLAIN, + "nova.volume.encryptors.nop.NoopEncryptor": None, "os_brick.encryptors.luks.LuksEncryptor": LUKS, "os_brick.encryptors.cryptsetup.CryptsetupEncryptor": PLAIN, "os_brick.encryptors.nop.NoopEncryptor": None, diff -Nru python-os-brick-1.10.0/os_brick/tests/encryptors/test_base.py python-os-brick-1.11.0/os_brick/tests/encryptors/test_base.py --- python-os-brick-1.10.0/os_brick/tests/encryptors/test_base.py 2017-01-19 18:42:45.000000000 +0000 +++ python-os-brick-1.11.0/os_brick/tests/encryptors/test_base.py 2017-01-25 02:21:35.000000000 +0000 @@ -59,6 +59,8 @@ encryptors.luks.LuksEncryptor) self._test_get_encryptor('os_brick.encryptors.luks.LuksEncryptor', encryptors.luks.LuksEncryptor) + self._test_get_encryptor('nova.volume.encryptors.luks.LuksEncryptor', + encryptors.luks.LuksEncryptor) self._test_get_encryptor('plain', encryptors.cryptsetup.CryptsetupEncryptor) @@ -68,6 +70,9 @@ self._test_get_encryptor( 'os_brick.encryptors.cryptsetup.CryptsetupEncryptor', encryptors.cryptsetup.CryptsetupEncryptor) + self._test_get_encryptor( + 'nova.volume.encryptors.cryptsetup.CryptsetupEncryptor', + encryptors.cryptsetup.CryptsetupEncryptor) self._test_get_encryptor(None, encryptors.nop.NoOpEncryptor) @@ -76,6 +81,8 @@ encryptors.nop.NoOpEncryptor) self._test_get_encryptor('os_brick.encryptors.nop.NoOpEncryptor', encryptors.nop.NoOpEncryptor) + self._test_get_encryptor('nova.volume.encryptors.nop.NoopEncryptor', + encryptors.nop.NoOpEncryptor) def test_get_error_encryptors(self): encryption = {'control_location': 'front-end', @@ -146,6 +153,14 @@ keymgr=self.keymgr, **encryption) + encryption = {'control_location': 'front-end', + 'provider': 'nova.volume.encryptors.luks.LuksEncryptor'} + encryptors.get_volume_encryptor( + root_helper=self.root_helper, + connection_info=self.connection_info, + keymgr=self.keymgr, + **encryption) + log.warning.assert_has_calls([ mock.call("Use of the in tree encryptor class %(provider)s by " "directly referencing the implementation class will be " @@ -155,4 +170,9 @@ "directly referencing the implementation class will be " "blocked in the Pike release of os-brick.", {'provider': - 'os_brick.encryptors.luks.LuksEncryptor'})]) + 'os_brick.encryptors.luks.LuksEncryptor'}), + mock.call("Use of the in tree encryptor class %(provider)s by " + "directly referencing the implementation class will be " + "blocked in the Pike release of os-brick.", + {'provider': + 'nova.volume.encryptors.luks.LuksEncryptor'})]) diff -Nru python-os-brick-1.10.0/os_brick.egg-info/pbr.json python-os-brick-1.11.0/os_brick.egg-info/pbr.json --- python-os-brick-1.10.0/os_brick.egg-info/pbr.json 2017-01-19 18:43:23.000000000 +0000 +++ python-os-brick-1.11.0/os_brick.egg-info/pbr.json 2017-01-25 02:22:47.000000000 +0000 @@ -1 +1 @@ -{"is_release": true, "git_version": "1a9b90b"} \ No newline at end of file +{"is_release": true, "git_version": "6a18026"} \ No newline at end of file diff -Nru python-os-brick-1.10.0/os_brick.egg-info/PKG-INFO python-os-brick-1.11.0/os_brick.egg-info/PKG-INFO --- python-os-brick-1.10.0/os_brick.egg-info/PKG-INFO 2017-01-19 18:43:23.000000000 +0000 +++ python-os-brick-1.11.0/os_brick.egg-info/PKG-INFO 2017-01-25 02:22:47.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: os-brick -Version: 1.10.0 +Version: 1.11.0 Summary: OpenStack Cinder brick library for managing local volume attaches Home-page: http://docs.openstack.org/developer/os-brick/ Author: OpenStack diff -Nru python-os-brick-1.10.0/os_brick.egg-info/requires.txt python-os-brick-1.11.0/os_brick.egg-info/requires.txt --- python-os-brick-1.10.0/os_brick.egg-info/requires.txt 2017-01-19 18:43:23.000000000 +0000 +++ python-os-brick-1.11.0/os_brick.egg-info/requires.txt 2017-01-25 02:22:47.000000000 +0000 @@ -11,4 +11,4 @@ requests!=2.12.2,>=2.10.0 retrying!=1.3.0,>=1.2.3 six>=1.9.0 -os-win>=1.3.0 +os-win>=1.4.0 diff -Nru python-os-brick-1.10.0/PKG-INFO python-os-brick-1.11.0/PKG-INFO --- python-os-brick-1.10.0/PKG-INFO 2017-01-19 18:43:23.000000000 +0000 +++ python-os-brick-1.11.0/PKG-INFO 2017-01-25 02:22:48.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: os-brick -Version: 1.10.0 +Version: 1.11.0 Summary: OpenStack Cinder brick library for managing local volume attaches Home-page: http://docs.openstack.org/developer/os-brick/ Author: OpenStack diff -Nru python-os-brick-1.10.0/requirements.txt python-os-brick-1.11.0/requirements.txt --- python-os-brick-1.10.0/requirements.txt 2017-01-19 18:42:45.000000000 +0000 +++ python-os-brick-1.11.0/requirements.txt 2017-01-25 02:21:35.000000000 +0000 @@ -15,4 +15,4 @@ requests!=2.12.2,>=2.10.0 # Apache-2.0 retrying!=1.3.0,>=1.2.3 # Apache-2.0 six>=1.9.0 # MIT -os-win>=1.3.0 # Apache-2.0 +os-win>=1.4.0 # Apache-2.0 diff -Nru python-os-brick-1.10.0/test-requirements.txt python-os-brick-1.11.0/test-requirements.txt --- python-os-brick-1.10.0/test-requirements.txt 2017-01-19 18:42:45.000000000 +0000 +++ python-os-brick-1.11.0/test-requirements.txt 2017-01-25 02:21:35.000000000 +0000 @@ -14,5 +14,5 @@ testscenarios>=0.4 # Apache-2.0/BSD testtools>=1.4.0 # MIT os-testr>=0.8.0 # Apache-2.0 -oslo.vmware>=2.15.0 # Apache-2.0 +oslo.vmware>=2.17.0 # Apache-2.0 castellan>=0.4.0 # Apache-2.0