Merge "Updated deprecated keystone_authtoken option"

Jenkins · openstack-gerrit · commit 0a2a7ae84715 · 2016-03-18T20:24:03.000Z
diff --git a/lib/keystone b/lib/keystone
@@ -480,7 +480,7 @@ function configure_auth_token_middleware {
     iniset $conf_file $section auth_uri $KEYSTONE_SERVICE_URI
     iniset $conf_file $section cafile $SSL_BUNDLE_FILE
     iniset $conf_file $section signing_dir $signing_dir
-    iniset $conf_file $section memcache_servers $SERVICE_HOST:11211
+    iniset $conf_file $section memcached_servers $SERVICE_HOST:11211
 }
 
 # init_keystone() - Initialize databases, etc.

Original file line number	Diff line number	Diff line change
`@@ -480,7 +480,7 @@ function configure_auth_token_middleware {`
`480`	`480`	`iniset $conf_file $section auth_uri $KEYSTONE_SERVICE_URI`
`481`	`481`	`iniset $conf_file $section cafile $SSL_BUNDLE_FILE`
`482`	`482`	`iniset $conf_file $section signing_dir $signing_dir`
`483`		`- iniset $conf_file $section memcache_servers $SERVICE_HOST:11211`
	`483`	`+ iniset $conf_file $section memcached_servers $SERVICE_HOST:11211`
`484`	`484`	`}`
`485`	`485`
`486`	`486`	`# init_keystone() - Initialize databases, etc.`