Merge "Default to memcache for PM cache"

This commit is contained in:
Jenkins 2015-07-15 17:03:59 +00:00 committed by Gerrit Code Review
commit d36b29f42f
4 changed files with 4 additions and 4 deletions

View File

@ -45,7 +45,7 @@ DESIGNATE_APIPASTE_CONF=$DESIGNATE_CONF_DIR/api-paste.ini
# Set up default options # Set up default options
DESIGNATE_BACKEND_DRIVER=${DESIGNATE_BACKEND_DRIVER:=powerdns} DESIGNATE_BACKEND_DRIVER=${DESIGNATE_BACKEND_DRIVER:=powerdns}
DESIGNATE_POOL_MANAGER_CACHE_DRIVER=${DESIGNATE_POOL_MANAGER_CACHE_DRIVER:-noop} DESIGNATE_POOL_MANAGER_CACHE_DRIVER=${DESIGNATE_POOL_MANAGER_CACHE_DRIVER:-memcache}
DESIGNATE_POOL_ID=${DESIGNATE_POOL_ID:-794ccc2c-d751-44fe-b57f-8894c9f5c842} DESIGNATE_POOL_ID=${DESIGNATE_POOL_ID:-794ccc2c-d751-44fe-b57f-8894c9f5c842}
DESIGNATE_TARGET_ID=${DESIGNATE_TARGET_ID:-f26e0b32-736f-4f0a-831b-039a415c481e} DESIGNATE_TARGET_ID=${DESIGNATE_TARGET_ID:-f26e0b32-736f-4f0a-831b-039a415c481e}
DESIGNATE_DEFAULT_NS_RECORD=${DESIGNATE_DEFAULT_NS_RECORD:-ns1.devstack.org.} DESIGNATE_DEFAULT_NS_RECORD=${DESIGNATE_DEFAULT_NS_RECORD:-ns1.devstack.org.}

View File

@ -33,7 +33,7 @@ ENABLED_SERVICES+=,designate,designate-central,designate-api,designate-pool-mana
# Pool Manager Cache Driver (e.g. noop, memcache, sqlalchemy. See # Pool Manager Cache Driver (e.g. noop, memcache, sqlalchemy. See
# designate.backend section of setup.cfg) # designate.backend section of setup.cfg)
#DESIGNATE_POOL_MANAGER_CACHE_DRIVER=noop #DESIGNATE_POOL_MANAGER_CACHE_DRIVER=memcache
# mDNS Service DNS Port Number # mDNS Service DNS Port Number
#DESIGNATE_SERVICE_PORT_MDNS=5354 #DESIGNATE_SERVICE_PORT_MDNS=5354

View File

@ -54,7 +54,7 @@ OPTS = [
cfg.IntOpt('periodic-sync-seconds', default=21600, cfg.IntOpt('periodic-sync-seconds', default=21600,
help='Zones Updated within last N seconds will be syncd. Use ' help='Zones Updated within last N seconds will be syncd. Use '
'None to sync all zones.'), 'None to sync all zones.'),
cfg.StrOpt('cache-driver', default='sqlalchemy', cfg.StrOpt('cache-driver', default='memcache',
help='The cache driver to use'), help='The cache driver to use'),
] ]

View File

@ -259,7 +259,7 @@ debug = False
#periodic_sync_seconds = None #periodic_sync_seconds = None
# The cache driver to use # The cache driver to use
#cache_driver = sqlalchemy #cache_driver = memcache
################################### ###################################
## Pool Manager Cache Configuration ## Pool Manager Cache Configuration