Merge "Move etcd to step 2"
authorJenkins <jenkins@review.openstack.org>
Mon, 10 Apr 2017 13:45:40 +0000 (13:45 +0000)
committerGerrit Code Review <review@openstack.org>
Mon, 10 Apr 2017 13:45:40 +0000 (13:45 +0000)

Trivial merge