Merge "Remove unnecessary ini commenting from nova"
This commit is contained in:
commit
df97cf3676
10
lib/nova
10
lib/nova
@ -246,16 +246,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
|
||||
|
Loading…
x
Reference in New Issue
Block a user