From: Thomas Goirand Date: Tue, 8 Dec 2015 09:39:18 +0000 (+0100) Subject: Attempt to fix genconfig X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b6ee50c5c87c8a18543ef584aad3d469f55ce5bb;p=openstack-build%2Fcinder-build.git Attempt to fix genconfig Rewritten-From: 732c659081bfb38d9c16f32fa15b1aa1f276a32f --- diff --git a/xenial/debian/rules b/xenial/debian/rules index f3ea60b11..1fef7ec77 100755 --- a/xenial/debian/rules +++ b/xenial/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