From 732c659081bfb38d9c16f32fa15b1aa1f276a32f Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Tue, 8 Dec 2015 10:39:18 +0100
Subject: [PATCH] Attempt to fix genconfig

---
 debian/rules | 48 ++++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/debian/rules b/debian/rules
index f3ea60b11..1fef7ec77 100755
--- 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
-- 
2.45.2