openstack/devstack
Code Issues Proposed changes

Remove unnecessary ini commenting from nova

Browse Source 
Nova does not ship these options in it's api-paste.conf any more so the
functions have no effect.

Change-Id: Ie4527a0639e977e83e6bfc07751ba062839e0600
This commit is contained in:
Jamie Lennox 2014-06-02 10:42:14 +10:00
parent 47ae725f13
commit 25e548be3c
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/nova
View File

@ -241,16 +241,6 @@ function configure_nova {
# Get the sample configuration file in place # Get the sample configuration file in place
cp $NOVA_DIR/etc/nova/api-paste.ini $NOVA_CONF_DIR cp $NOVA_DIR/etc/nova/api-paste.ini $NOVA_CONF_DIR
# Comment out the keystone configs in Nova's api-paste.ini.
# We are using nova.conf to configure this instead.
inicomment $NOVA_API_PASTE_INI filter:authtoken auth_host
inicomment $NOVA_API_PASTE_INI filter:authtoken auth_protocol
inicomment $NOVA_API_PASTE_INI filter:authtoken admin_tenant_name
inicomment $NOVA_API_PASTE_INI filter:authtoken cafile
inicomment $NOVA_API_PASTE_INI filter:authtoken admin_user
inicomment $NOVA_API_PASTE_INI filter:authtoken admin_password
inicomment $NOVA_API_PASTE_INI filter:authtoken signing_dir
fi fi
if is_service_enabled n-cpu; then if is_service_enabled n-cpu; then