From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 1 Mar 2017 07:17:47 +0000 (+0000)
Subject: Merge "upgrades: fix ec2api conditional" into stable/ocata
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=1ab18342023458c58e6771b94c22ede89c917af3;p=apex-tripleo-heat-templates.git

Merge "upgrades: fix ec2api conditional" into stable/ocata
---

1ab18342023458c58e6771b94c22ede89c917af3