commit df97cf3676f25dae956237e72a5631ef24f4c89a
author Jenkins <jenkins@review.openstack.org> Sun Jun 15 01:49:44 2014 +0000
committer Gerrit Code Review <review@openstack.org> Sun Jun 15 01:49:44 2014 +0000
tree 72a0ba508aeddd38728a7aa7b1d201ee2773d353
parent a1a601316ecbd4882980cef5e8136e903d3eb6ea
parent 25e548be3c808f02c4f9e854b73cb7e2a41caa5b

Merge "Remove unnecessary ini commenting from nova"

lib/nova

diff --git a/lib/nova b/lib/nova
index 5607615..76929b1 100644
--- a/lib/nova
+++ b/lib/nova
@@ -246,16 +246,6 @@
 
         # 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