Code Review
/
openstack-build
/
cinder-build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix double [DEFAULT] within config generation
[openstack-build/cinder-build.git]
/
trusty
/
debian
/
cinder-common.postinst
diff --git
a/trusty/debian/cinder-common.postinst
b/trusty/debian/cinder-common.postinst
index 3fa8dbc1b8082656f3d5cd9bbaa1a232ca781050..fbea5f39020a0a8a2e9db78862b77d051c0846cf 100644
(file)
--- a/
trusty/debian/cinder-common.postinst
+++ b/
trusty/debian/cinder-common.postinst
@@
-79,14
+79,11
@@
if [ "$1" = "configure" ]; then
oslo-config-generator \
--namespace oslo_concurrency --namespace oslo_db \
--namespace oslo_messaging --namespace policy \
oslo-config-generator \
--namespace oslo_concurrency --namespace oslo_db \
--namespace oslo_messaging --namespace policy \
- --namespace keystonemiddleware.auth_token >> /etc/cinder/cinder.conf.sample
+ --namespace keystonemiddleware.auth_token \
+ | sed '/^\[DEFAULT/d' >> /etc/cinder/cinder.conf.sample
if [ "$?" -ne 0 ]; then
if [ "$?" -ne 0 ]; then
- echo "cinder configuration file generation fails!"
- fi
-
- if [ ! -f "/etc/cinder/cinder.conf" ]; then
- cp /etc/cinder/cinder.conf.sample /etc/cinder/cinder.conf
+ echo "cinder sample configuration file generation fails!"
fi
if [ -e /var/lib/cinder/cinder.sqlite ]; then
fi
if [ -e /var/lib/cinder/cinder.sqlite ]; then