Commit c70ee90a authored by David Johnson's avatar David Johnson

Default memcached on for >= Mitaka. Ouch.

Also add options to fully enable it that aren't really in the install
docs.  Ugh, I should've checked back to see if the stability of memcache
integration had improved.  The API and GUI were just getting far too
slow without it.
parent b1e172ae
......@@ -345,28 +345,35 @@ if [ -z "${KEYSTONE_DBPASS}" ]; then
crudini --set /etc/keystone/keystone.conf token driver \
'keystone.token.persistence.backends.memcache.Token'
crudini --set /etc/keystone/keystone.conf memcache servers \
'localhost:11211'
'127.0.0.1:11211'
else
crudini --set /etc/keystone/keystone.conf token driver \
'keystone.token.persistence.backends.sql.Token'
fi
elif [ $OSVERSION -le $OSMITAKA ]; then
crudini --set /etc/keystone/keystone.conf token provider 'uuid'
crudini --set /etc/keystone/keystone.conf revoke driver 'sql'
if [ $KEYSTONEUSEMEMCACHE -eq 1 ]; then
crudini --set /etc/keystone/keystone.conf token driver 'memcache'
crudini --set /etc/keystone/keystone.conf memcache servers \
'localhost:11211'
else
if [ $OSVERSION -le $OSMITAKA ]; then
crudini --set /etc/keystone/keystone.conf token provider 'uuid'
crudini --set /etc/keystone/keystone.conf revoke driver 'sql'
else
crudini --set /etc/keystone/keystone.conf token driver 'sql'
crudini --set /etc/keystone/keystone.conf token provider fernet
fi
else
crudini --set /etc/keystone/keystone.conf token provider fernet
if [ $KEYSTONEUSEMEMCACHE -eq 1 ]; then
crudini --set /etc/keystone/keystone.conf token driver 'memcache'
crudini --set /etc/keystone/keystone.conf cache \
backend dogpile.cache.memcached
crudini --set /etc/keystone/keystone.conf cache \
backend_argument url:127.0.0.1:11211
crudini --set /etc/keystone/keystone.conf cache \
enable true
crudini --set /etc/keystone/keystone.conf cache \
enabled true
crudini --set /etc/keystone/keystone.conf cache \
memcache_servers 127.0.0.1:11211
crudini --set /etc/keystone/keystone.conf cache \
memcached_servers 127.0.0.1:11211
crudini --set /etc/keystone/keystone.conf memcache servers \
'localhost:11211'
'127.0.0.1:11211'
else
crudini --set /etc/keystone/keystone.conf token driver 'sql'
fi
......
......@@ -344,6 +344,13 @@ else
OSVERSION=$OSJUNO
fi
#
# Default memcached fully on for Mitaka or greater. Too slow without it.
#
if [ $OSVERSION -ge $OSMITAKA ]; then
KEYSTONEUSEMEMCACHE=1
fi
if [ $OSVERSION -eq $OSJUNO ]; then
REGION="regionOne"
else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment