From 25e548be3c808f02c4f9e854b73cb7e2a41caa5b Mon Sep 17 00:00:00 2001 From: Jamie Lennox Date: Mon, 2 Jun 2014 10:42:14 +1000 Subject: [PATCH] Remove unnecessary ini commenting from nova Nova does not ship these options in it's api-paste.conf any more so the functions have no effect. Change-Id: Ie4527a0639e977e83e6bfc07751ba062839e0600 --- lib/nova | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/lib/nova b/lib/nova index 722eabb402..1a756f787a 100644 --- a/lib/nova +++ b/lib/nova @@ -241,16 +241,6 @@ function configure_nova { # Get the sample configuration file in place 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 if is_service_enabled n-cpu; then