Browse code

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

Jamie Lennox authored on 2014/06/02 09:42:14
Showing 1 changed files
... ...
@@ -241,16 +241,6 @@ function configure_nova {
241 241
 
242 242
         # Get the sample configuration file in place
243 243
         cp $NOVA_DIR/etc/nova/api-paste.ini $NOVA_CONF_DIR
244
-
245
-        # Comment out the keystone configs in Nova's api-paste.ini.
246
-        # We are using nova.conf to configure this instead.
247
-        inicomment $NOVA_API_PASTE_INI filter:authtoken auth_host
248
-        inicomment $NOVA_API_PASTE_INI filter:authtoken auth_protocol
249
-        inicomment $NOVA_API_PASTE_INI filter:authtoken admin_tenant_name
250
-        inicomment $NOVA_API_PASTE_INI filter:authtoken cafile
251
-        inicomment $NOVA_API_PASTE_INI filter:authtoken admin_user
252
-        inicomment $NOVA_API_PASTE_INI filter:authtoken admin_password
253
-        inicomment $NOVA_API_PASTE_INI filter:authtoken signing_dir
254 244
     fi
255 245
 
256 246
     if is_service_enabled n-cpu; then