Merge "use new options instead of deprecated options for keystone"
authorshuai chen <chenshuai@huawei.com>
Tue, 12 Jan 2016 14:49:19 +0000 (14:49 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 12 Jan 2016 14:49:20 +0000 (14:49 +0000)

Trivial merge