Using hacked/patched cinder.conf until https://bugs.launchpad.net/cinder/+bug/1447380 is fixed

This commit is contained in:
Thomas Goirand 2015-04-23 01:23:33 +02:00
parent b1a68cef33
commit a1f7e01882
2 changed files with 2852 additions and 14 deletions

2858
debian/cinder.conf vendored

File diff suppressed because it is too large Load Diff

8
debian/rules vendored
View File

@ -18,11 +18,13 @@ override_dh_clean:
rm -rf debian/*.upstart debian/*.service
override_dh_install:
tools/config/generate_sample.sh -b . -p cinder -o etc/cinder
#tools/config/generate_sample.sh -b . -p cinder -o etc/cinder
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)/etc/cinder/cinder.conf.sample $(CURDIR)/debian/cinder-common/usr/share/cinder-common/cinder.conf
install -D -m 0644 $(CURDIR)/etc/cinder/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
install -D -m 0644 $(CURDIR)/etc/cinder/logging_sample.conf $(CURDIR)/debian/cinder-common/usr/share/cinder-common/logging.conf