aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-18 16:57:56 +0000
committerGerrit Code Review <review@openstack.org>2017-03-18 16:57:56 +0000
commit8ac8e20e675ee16a500cbd6e7093c41f6f40b90e (patch)
tree5b541a8312b5f0b0360b82b8becaa0552f39b38e /puppet
parentf4d76943c4926b03eb0fff04629745b85dcdbd97 (diff)
parentbae48e60b3cb9b5f21490997ca39c1e0e23fd195 (diff)
Merge "Make sure PrePuppet runs before any Deployment_Step"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/puppet-steps.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/puppet-steps.j2 b/puppet/puppet-steps.j2
index 581c4f0d..86af6114 100644
--- a/puppet/puppet-steps.j2
+++ b/puppet/puppet-steps.j2
@@ -42,7 +42,7 @@
{{role.name}}Deployment_Step{{step}}:
type: OS::Heat::StructuredDeploymentGroup
{% if step == 1 %}
- depends_on: [{{role.name}}PreConfig, {{role.name}}ArtifactsDeploy]
+ depends_on: [{{role.name}}PrePuppet, {{role.name}}PreConfig, {{role.name}}ArtifactsDeploy]
{% else %}
depends_on:
{% for dep in roles %}