diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-08-13 06:56:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-08-13 06:56:00 +0000 |
| commit | 76ca1797a458689082f0731b0b395a87c2fc51fd (patch) | |
| tree | f5a2436258fa0ff00f28d822f7b693b314784722 | |
| parent | 0d38c36d36b532e75078535c5a33ae1185733248 (diff) | |
| parent | ec58a4b6c5955736ec20b03496f03b281d6720ef (diff) | |
Merge "Add environment to disable deploy steps"
| -rw-r--r-- | common/deploy-steps.j2 | 2 | ||||
| -rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index b798a67f..b36bb97a 100644 --- a/common/deploy-steps.j2 +++ b/common/deploy-steps.j2 @@ -244,7 +244,7 @@ resources: {% for step in range(1, deploy_steps_max) %} {{role.name}}Deployment_Step{{step}}: - type: OS::Heat::StructuredDeploymentGroup + type: OS::TripleO::DeploymentSteps depends_on: - WorkflowTasks_Step{{step}}_Execution # TODO(gfidente): the following if/else condition diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index fdf3bf6a..63868b54 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -109,6 +109,8 @@ resource_registry: OS::TripleO::DeployedServerEnvironment: OS::Heat::None + OS::TripleO::DeploymentSteps: OS::Heat::StructuredDeploymentGroup + # services OS::TripleO::Services: common/services.yaml OS::TripleO::Services::Apache: puppet/services/apache.yaml |