openstack/devstack
Code Issues Proposed changes

Use new cafile option in nova cinder options

Browse Source 
ca_certificate_file is deprecated in favour of using the standard
options from keystoneclient session.

Change-Id: I611da719fb3a95d0a9c2f6ad43e2c083ea7d6862
This commit is contained in:
Jamie Lennox 2014-11-25 12:08:55 +10:00
parent db3225c126
commit 55c7ebbdba
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nova
View File

@ -459,7 +459,7 @@ function create_nova_conf {
CINDER_SERVICE_HOST=${CINDER_SERVICE_HOST:-$SERVICE_HOST}
CINDER_SERVICE_PORT=${CINDER_SERVICE_PORT:-8776}
iniset $NOVA_CONF cinder endpoint_template "https://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/%(project_id)s"
iniset $NOVA_CONF cinder ca_certificates_file $SSL_BUNDLE_FILE
iniset $NOVA_CONF cinder cafile $SSL_BUNDLE_FILE
fi
fi