From 55c0b225e22a40e51c30215825f266dadb635513 Mon Sep 17 00:00:00 2001 From: John Griffith <john.griffith@solidfire.com> Date: Fri, 30 May 2014 15:40:04 +0000 Subject: [PATCH] Remove copy of cinder.conf.sample file Rather than continue to be bit by conf updates from external sources, Cinder is going to join the party and cease generation of the sample.conf as part of the unit tests. First step however is to not attempt to copy it from cinder/etc/cinder in the devstack setup. This just removes that cp operation, nothing in that sample conf was modfied from defaults so it wasn't really doing anything anyway. Change-Id: I727b1747ff36d775ef881e93e3b9a8528a17a4df --- lib/cinder | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/cinder b/lib/cinder index dadbe40a3b..d5ee17e65b 100644 --- a/lib/cinder +++ b/lib/cinder @@ -233,8 +233,6 @@ function configure_cinder { 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