Merge "Add Ec2Api to container based deployment"
authorJenkins <jenkins@review.openstack.org>
Fri, 16 Jun 2017 19:58:19 +0000 (19:58 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 16 Jun 2017 19:58:19 +0000 (19:58 +0000)

Trivial merge