Merge "Add controller and compute recovery roles"
authorshuai chen <chenshuai@huawei.com>
Mon, 29 Aug 2016 01:55:45 +0000 (01:55 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 29 Aug 2016 01:55:45 +0000 (01:55 +0000)

Trivial merge