commit 142adec5d683677484ffb3ad9d37a3f37484c052
author Jenkins <jenkins@review.openstack.org> Mon Jun 02 22:45:07 2014 +0000
committer Gerrit Code Review <review@openstack.org> Mon Jun 02 22:45:07 2014 +0000
tree 63b676d665c4c744ea36fdf23c3e17ad3b304814
parent 47ae725f1337ba76189604b685ccaec6c7b7bff9
parent 55c0b225e22a40e51c30215825f266dadb635513

Merge "Remove copy of cinder.conf.sample file"

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index dadbe40..d5ee17e 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -233,8 +233,6 @@
     inicomment $CINDER_API_PASTE_INI filter:authtoken admin_password
     inicomment $CINDER_API_PASTE_INI filter:authtoken signing_dir
 
-    cp $CINDER_DIR/etc/cinder/cinder.conf.sample $CINDER_CONF
-
     iniset $CINDER_CONF keystone_authtoken auth_host $KEYSTONE_AUTH_HOST
     iniset $CINDER_CONF keystone_authtoken auth_port $KEYSTONE_AUTH_PORT
     iniset $CINDER_CONF keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL