Attempt to fix genconfig

diff --git a/debian/rules b/debian/rules
index f3ea60b119331575e3954fe2e484b245d2c0ff0f..1fef7ec777f327a263f18181002de49f88f574ce 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -32,32 +32,32 @@ override_dh_install:
        install -D -m 0440 debian/cinder-common.sudoers $(CURDIR)/debian/cinder-common/etc/sudoers.d/cinder-common
 
        mkdir -p $(CURDIR)/debian/cinder-common/usr/share/cinder-common
-#      $(CURDIR)/tools/config/generate_sample.sh from_tox
-       PYTHONPATH=. oslo-config-generator --output-file $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf \
-               --wrap-width 80 \
-               --namespace cinder \
-               --namespace keystonemiddleware.auth_token \
-               --namespace oslo.config \
-               --namespace oslo.concurrency \
-               --namespace oslo.context \
-               --namespace oslo.db \
-               --namespace oslo.i18n \
-               --namespace oslo.log \
-               --namespace oslo.messaging \
-               --namespace oslo.middleware \
-               --namespace oslo.policy \
-               --namespace oslo.reports \
-               --namespace oslo.rootwrap \
-               --namespace oslo.serialization \
-               --namespace oslo.service \
-               --namespace oslo.utils \
-               --namespace oslo.versionedobjects \
-               --namespace oslo.vmware
+       $(CURDIR)/tools/config/generate_sample.sh from_tox
+#      PYTHONPATH=. oslo-config-generator --output-file $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf \
+#              --wrap-width 80 \
+#              --namespace cinder \
+#              --namespace keystonemiddleware.auth_token \
+#              --namespace oslo.config \
+#              --namespace oslo.concurrency \
+#              --namespace oslo.context \
+#              --namespace oslo.db \
+#              --namespace oslo.i18n \
+#              --namespace oslo.log \
+#              --namespace oslo.messaging \
+#              --namespace oslo.middleware \
+#              --namespace oslo.policy \
+#              --namespace oslo.reports \
+#              --namespace oslo.rootwrap \
+#              --namespace oslo.serialization \
+#              --namespace oslo.service \
+#              --namespace oslo.utils \
+#              --namespace oslo.versionedobjects \
+#              --namespace oslo.vmware
        # The generator is currently missing enabled_backend and the [lvm]
        # section. This script fixes it until upstream gets smarter.
-       chmod +x debian/gen-fixed-config
-       ./debian/gen-fixed-config
-       #cp etc/cinder/cinder.conf.sample $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
+#      chmod +x debian/gen-fixed-config
+#      ./debian/gen-fixed-config
+       cp etc/cinder/cinder.conf.sample $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
 
        # Set a default value for lock_path
        sed -i 's|^[ \t#]*lock_path[ \t]*=.*|lock_path = /var/lock/cinder|' $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf