Definitively fix config file generation.

diff --git a/debian/changelog b/debian/changelog
index 0b7376ffb8225b7231f4f0d59a0950b4dc2c1526..7f9fc5a2c49d1e734e67e7ef3ee28cf67e9b1b1c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
 cinder (2:7.0.0~rc1-2) experimental; urgency=medium
 
   * cinder-api depends on python-openstackclient.
-  * Fixed cinder.conf generation.
   * cinder-api also registering the volumev2 type.
-  * Fixed the default path for lock_path.
-  * Added upstream patch for fixing config file generation.
+  * Fixed cinder.conf generation:
+    - Fixed the default path for lock_path.
+    - Added upstream patch for fixing config file generation.
+    - Manually set enabled_backends = lvm, and appends a [lvm] section to set
+      the LVM backend as default.
 
  -- Thomas Goirand <zigo@debian.org>  Tue, 29 Sep 2015 13:23:42 +0000
 

diff --git a/debian/patches/Downstream_Fix_for_Genconfig.patch b/debian/patches/Downstream_Fix_for_Genconfig.patch
index 0f0f474819a1fafabbf335a7f6e66fc970d1b27c..6f01991d1a8fc593d8b419ff56348abb0c5f1300 100644 (file)
--- a/debian/patches/Downstream_Fix_for_Genconfig.patch
+++ b/debian/patches/Downstream_Fix_for_Genconfig.patch
@@ -1,22 +1,15 @@
-From: Kendall Nelson <kjnelson@us.ibm.com>
-Date: Wed, 7 Oct 2015 13:53:38 +0000 (-0500)
-Subject: Downstream Fix for Genconfig
-X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fcinder.git;a=commitdiff_plain;h=54fd32a70f9539703d57bebc4c321452debda01c
-
-Downstream Fix for Genconfig
-
-This patch adds the opts.py file to the tree as a fix for deployers
-that package cinder. The opts.py file is no longer being deleted right
-away by generate_sample.sh after the cinder.sample.conf is being
-generated.
-
-This patch also introduces a pep8 check to make sure that the opts.py
-file is up to date, so that it will catch when new opts get added to
-Cinder without the opts.py being updated.
-
-To support the ability to keep and check the opts file a number
-of changes were needed in the check_uptodate.sh script as well as
-the generate_sample.sh script:
+Description: Downstream Fix for Genconfig
+ This patch adds the opts.py file to the tree as a fix for deployers that
+ package cinder. The opts.py file is no longer being deleted right away by
+ generate_sample.sh after the cinder.sample.conf is being generated.
+ .
+ This patch also introduces a pep8 check to make sure that the opts.py file is
+ up to date, so that it will catch when new opts get added to Cinder without
+ the opts.py being updated.
+ .
+ To support the ability to keep and check the opts file a number of changes
+ were needed in the check_uptodate.sh script as well as the generate_sample.sh
+ script:
     - check_uptodate now takes --checkopts instead of --checkonly
       When checkopts is used the opts.py file is generated using the
       current code and the generated file is compared to the existing
@@ -28,19 +21,18 @@ the generate_sample.sh script:
     - generate_sample also has some coding style consistency changes.
     - Added the 'genopts' option to tox so users can generate
       a fresh opts.py without a sample file when necessary.
-
-Closes-Bug: 1501820
+Author: Kendall Nelson <kjnelson@us.ibm.com>
+Date: Wed, 7 Oct 2015 13:53:38 +0000 (-0500)
+X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fcinder.git;a=commitdiff_plain;h=54fd32a70f9539703d57bebc4c321452debda01c
+Bug-Ubuntu: https://bugs.launchpad.net/cinder/+bug/1501820
 Co-Author: Jay Bryant <jsbryant@us.ibm.com>
-
 Change-Id: I1f5494ebb19d5f4e8c651cbeef0acad07ad96829
----
+Origin: upstream, https://review.openstack.org/#/c/232205/
+Last-Update: 2015-09-08
 
-diff --git a/cinder/opts.py b/cinder/opts.py
-new file mode 100644
-index 0000000..3583915
 --- /dev/null
-+++ b/cinder/opts.py
-@@ -0,0 +1,335 @@
++++ cinder-7.0.0~rc1/cinder/opts.py
+@@ -0,0 +1,330 @@
 +# Licensed under the Apache License, Version 2.0 (the "License");
 +# you may not use this file except in compliance with the License.
 +# You may obtain a copy of the License at
@@ -190,8 +182,6 @@ index 0000000..3583915
 +from cinder.volume.drivers.windows import windows as \
 +    cinder_volume_drivers_windows_windows
 +from cinder.volume.drivers import xio as cinder_volume_drivers_xio
-+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 import manager as cinder_volume_manager
@@ -278,7 +268,6 @@ index 0000000..3583915
 +                cinder_scheduler_weights_volumenumber.
 +                volume_number_weight_opts,
 +                cinder_volume_drivers_xio.XIO_OPTS,
-+                cinder_volume_drivers_zfssa_zfssaiscsi.ZFSSA_OPTS,
 +                cinder_wsgi_eventletserver.socket_opts,
 +                cinder_wsgi_eventletserver.eventlet_opts,
 +                cinder_volume_driver.volume_opts,
@@ -289,7 +278,6 @@ index 0000000..3583915
 +                cinder_volume_drivers_san_hp_hpmsacommon.common_opts,
 +                cinder_volume_drivers_san_hp_hpmsacommon.iscsi_opts,
 +                cinder_image_glance.glance_opts,
-+                cinder_image_glance.glance_core_properties_opts,
 +                cinder_volume_drivers_lvm.volume_opts,
 +                cinder_volume_drivers_emc_emcvmaxcommon.emc_opts,
 +                cinder_volume_drivers_remotefs.nas_opts,
@@ -331,7 +319,6 @@ index 0000000..3583915
 +                cinder_volume_drivers_ibm_flashsystemiscsi.
 +                flashsystem_iscsi_opts,
 +                cinder_volume_drivers_ibm_flashsystemcommon.flashsystem_opts,
-+                [cinder_volume_api.allow_force_upload_opt],
 +                [cinder_volume_api.volume_host_opt],
 +                [cinder_volume_api.volume_same_az_opt],
 +                [cinder_volume_api.az_cache_time_opt],

diff --git a/debian/patches/series b/debian/patches/series
index 3214a0ed6668f2db36b096158f98bb2010093667..51c8c38d4aa06c04437c36e81a4e27978d55b1c2 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 install-missing-files.patch
 disable-zfs-tests.patch
 Downstream_Fix_for_Genconfig.patch
-#Missing_configuration_opts_from_cinder.sample.conf.patch