Fix dependencies for PreConfig/PostConfig resources
authorSteven Hardy <shardy@redhat.com>
Tue, 25 Apr 2017 15:13:38 +0000 (15:13 +0000)
committerSteven Hardy <shardy@redhat.com>
Tue, 25 Apr 2017 15:13:38 +0000 (15:13 +0000)
commitba44524d4603b9f53a06e44af80b46a24661bdb1
tree6613ea2f67c93cc44c8b0111f72109b57eb7d3a9
parent386ac7791b1ed53445c059ec2b7b9f1a00222a37
Fix dependencies for PreConfig/PostConfig resources

We have a circular dependency errror since

https://review.openstack.org/#/c/452734/ landed.

This adjusts the dependencies to ensure we run pre-config before
the first puppet deploy step, and removes the duplicate declaration
of the ControllerPostConfig resource.  Also we ensure the first
container step always depends on the same step puppet deploy.

Change-Id: I70c5a39fb36b951bdeb04c15bddac7d00eebf08a
Closes-Bug: #1686098
docker/docker-steps.j2