Browse code

Merge "Remove unnecessary ini commenting from nova"

Jenkins authored on 2014/06/15 10:49:44
Showing 1 changed files
... ...
@@ -246,16 +246,6 @@ function configure_nova {
246 246
 
247 247
         # Get the sample configuration file in place
248 248
         cp $NOVA_DIR/etc/nova/api-paste.ini $NOVA_CONF_DIR
249
-
250
-        # Comment out the keystone configs in Nova's api-paste.ini.
251
-        # We are using nova.conf to configure this instead.
252
-        inicomment $NOVA_API_PASTE_INI filter:authtoken auth_host
253
-        inicomment $NOVA_API_PASTE_INI filter:authtoken auth_protocol
254
-        inicomment $NOVA_API_PASTE_INI filter:authtoken admin_tenant_name
255
-        inicomment $NOVA_API_PASTE_INI filter:authtoken cafile
256
-        inicomment $NOVA_API_PASTE_INI filter:authtoken admin_user
257
-        inicomment $NOVA_API_PASTE_INI filter:authtoken admin_password
258
-        inicomment $NOVA_API_PASTE_INI filter:authtoken signing_dir
259 249
     fi
260 250
 
261 251
     if is_service_enabled n-cpu; then