From 8f5b980fec7333ae8250d3718f1ce2c24d7a2180 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 15 Jul 2016 14:43:30 +0000 Subject: [PATCH] Rebased remove-zfssa-from-opts.py.patch. Rewritten-From: 78312f03eb648f7b7bc103beae4ce4d4c0479e95 --- xenial/debian/changelog | 1 + .../patches/remove-zfssa-from-opts.py.patch | 25 +++++++++---------- xenial/debian/patches/series | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/xenial/debian/changelog b/xenial/debian/changelog index 921339ddd..942037198 100644 --- a/xenial/debian/changelog +++ b/xenial/debian/changelog @@ -2,6 +2,7 @@ cinder (2:9.0.0~b2-1) experimental; urgency=medium * New upstream release. * Fixed (build-)depends for this release. + * Rebased remove-zfssa-from-opts.py.patch. * Updated Danish translation of the debconf templates (Closes: #830641). -- Thomas Goirand Fri, 15 Jul 2016 16:35:01 +0200 diff --git a/xenial/debian/patches/remove-zfssa-from-opts.py.patch b/xenial/debian/patches/remove-zfssa-from-opts.py.patch index 1ee3e0e6b..165817f0c 100644 --- a/xenial/debian/patches/remove-zfssa-from-opts.py.patch +++ b/xenial/debian/patches/remove-zfssa-from-opts.py.patch @@ -1,24 +1,23 @@ +zigo@GPLHost:xen018401>_ ~/sources/openstack/newton/cinder/cinder cinder (debian/newton)$ cat ../remove-zfssa-from-opts.py.patch Description: Remove zfssa from opts.py Author: Thomas Goirand Forwarded: no -Last-Update: 2016-01-02 +Last-Update: 2016-07-15 -Index: cinder/cinder/opts.py -=================================================================== ---- cinder.orig/cinder/opts.py -+++ cinder/cinder/opts.py -@@ -158,10 +158,6 @@ from cinder.volume.drivers import vzstor - from cinder.volume.drivers.windows import windows as \ +--- cinder-9.0.0~b2.orig/cinder/opts.py ++++ cinder-9.0.0~b2/cinder/opts.py +@@ -169,10 +169,6 @@ from cinder.volume.drivers.windows impor cinder_volume_drivers_windows_windows from cinder.volume.drivers import xio as cinder_volume_drivers_xio + from cinder.volume.drivers import zadara as cinder_volume_drivers_zadara -from cinder.volume.drivers.zfssa import zfssaiscsi as \ - cinder_volume_drivers_zfssa_zfssaiscsi -from cinder.volume.drivers.zfssa import zfssanfs as \ - cinder_volume_drivers_zfssa_zfssanfs + from cinder.volume.drivers.zte import zte_ks as cinder_volume_drivers_zte_zteks from cinder.volume import manager as cinder_volume_manager from cinder.wsgi import eventlet_server as cinder_wsgi_eventletserver - from cinder.zonemanager.drivers.brocade import brcd_fabric_opts as \ -@@ -267,7 +263,6 @@ def list_opts(): +@@ -281,7 +277,6 @@ def list_opts(): cinder_volume_drivers_xio.XIO_OPTS, cinder_volume_drivers_ibm_storwize_svc_storwizesvcfc. storwize_svc_fc_opts, @@ -26,11 +25,11 @@ Index: cinder/cinder/opts.py cinder_volume_driver.volume_opts, cinder_volume_driver.iser_opts, cinder_api_views_versions.versions_opts, -@@ -309,7 +304,6 @@ def list_opts(): +@@ -325,7 +320,6 @@ def list_opts(): cinder_volume_drivers_blockbridge.blockbridge_opts, [cinder_scheduler_scheduleroptions. scheduler_json_config_location_opt], - cinder_volume_drivers_zfssa_zfssanfs.ZFSSA_OPTS, - cinder_volume_drivers_disco_disco.disco_opts, - cinder_volume_drivers_hgst.hgst_opts, - cinder_message_api.messages_opts, + cinder_volume_drivers_fusionstorage_dsware.volume_opts, + cinder_volume_drivers_kaminario_kaminariocommon. + kaminario1_opts, diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series index 59d7ee85c..d84441263 100644 --- a/xenial/debian/patches/series +++ b/xenial/debian/patches/series @@ -1,3 +1,3 @@ no-zfssa-tests.patch -remove-zfssa-from-opts.py.patch install-missing-files.patch +remove-zfssa-from-opts.py.patch -- 2.45.2