openstack/devstack
Code Issues Proposed changes

Merge "Remove unnecessary ini commenting from nova"

Browse Source
This commit is contained in:
Jenkins 2014-06-15 01:49:44 +00:00 committed by Gerrit Code Review
commit df97cf3676
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

@ -246,16 +246,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