From 6d81c3fc6b3ed179f08c38e19d58f683ac1a90b0 Mon Sep 17 00:00:00 2001 From: Thomas Goirand <thomas@goirand.fr> Date: Thu, 23 Apr 2015 18:23:26 +0200 Subject: [PATCH] Now using oslo-config-generator to build the .conf.sample Rewritten-From: 86ba698968447ba7af0a58e375c7245ed957fa03 --- xenial/debian/rules | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/xenial/debian/rules b/xenial/debian/rules index 5dd0bda07..ea071208d 100755 --- a/xenial/debian/rules +++ b/xenial/debian/rules @@ -22,8 +22,15 @@ override_dh_install: dh_install --fail-missing -Xbin/cinder-all install -D -m 0440 debian/cinder-common.sudoers $(CURDIR)/debian/cinder-common/etc/sudoers.d/cinder-common - install -D -m 0644 $(CURDIR)/debian/cinder.conf $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf - #install -D -m 0644 $(CURDIR)/etc/cinder/cinder.conf.sample $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf + oslo-config-generator --output-file $(CURDIR)/etc/cinder/cinder.conf.sample \ + --namespace cinder \ + --namespace oslo.concurrency \ + --namespace oslo.db \ + --namespace oslo.messaging \ + --namespace oslo.policy \ + --namespace keystonemiddleware.auth_token + #install -D -m 0644 $(CURDIR)/debian/cinder.conf $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf + install -D -m 0644 $(CURDIR)/etc/cinder/cinder.conf.sample $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf # Disable https in default setup, as this makes our CI fail sed -i 's/#auth_protocol=https/auth_protocol=http/' $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf -- 2.45.2