Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Configure DPDK options to isolate PMD cores and ovs process cores"
[apex-tripleo-heat-templates.git]
/
puppet
/
post.j2.yaml
diff --git
a/puppet/post.j2.yaml
b/puppet/post.j2.yaml
index
582eb28
..
83c3286
100644
(file)
--- a/
puppet/post.j2.yaml
+++ b/
puppet/post.j2.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2016-10-14
+heat_template_version:
ocata
description: >
Post-deploy configuration steps via puppet for all roles,
description: >
Post-deploy configuration steps via puppet for all roles,
@@
-21,11
+21,10
@@
parameters:
perform configuration on a Heat stack-update.
resources:
perform configuration on a Heat stack-update.
resources:
-
-{% for role in roles %}
# Post deployment steps for all roles
# A single config is re-applied with an incrementing step number
# Post deployment steps for all roles
# A single config is re-applied with an incrementing step number
- # {{role.name}} Role steps
+{% for role in roles %}
+ # {{role.name}} Role post deploy steps
{{role.name}}ArtifactsConfig:
type: deploy-artifacts.yaml
{{role.name}}ArtifactsConfig:
type: deploy-artifacts.yaml
@@
-58,8
+57,6
@@
resources:
# Step through a series of configuration steps
{% for step in range(1, 6) %}
# Step through a series of configuration steps
{% for step in range(1, 6) %}
- {% for role in roles %}
-
{{role.name}}Deployment_Step{{step}}:
type: OS::Heat::StructuredDeploymentGroup
{% if step == 1 %}
{{role.name}}Deployment_Step{{step}}:
type: OS::Heat::StructuredDeploymentGroup
{% if step == 1 %}
@@
-77,8
+74,6
@@
resources:
input_values:
step: {{step}}
update_identifier: {get_param: DeployIdentifier}
input_values:
step: {{step}}
update_identifier: {get_param: DeployIdentifier}
-
- {% endfor %}
{% endfor %}
{{role.name}}PostConfig:
{% endfor %}
{{role.name}}PostConfig: