Browse code
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
John Griffith authored on 2014/05/31 00:40:04Showing 1 changed files
| ... | ... |
@@ -233,8 +233,6 @@ function configure_cinder {
|
| 233 | 233 |
inicomment $CINDER_API_PASTE_INI filter:authtoken admin_password |
| 234 | 234 |
inicomment $CINDER_API_PASTE_INI filter:authtoken signing_dir |
| 235 | 235 |
|
| 236 |
- cp $CINDER_DIR/etc/cinder/cinder.conf.sample $CINDER_CONF |
|
| 237 |
- |
|
| 238 | 236 |
iniset $CINDER_CONF keystone_authtoken auth_host $KEYSTONE_AUTH_HOST |
| 239 | 237 |
iniset $CINDER_CONF keystone_authtoken auth_port $KEYSTONE_AUTH_PORT |
| 240 | 238 |
iniset $CINDER_CONF keystone_authtoken auth_protocol $KEYSTONE_AUTH_PROTOCOL |