aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud.j2.yaml
diff options
context:
space:
mode:
authorCarlos Camacho <ccamacho@redhat.com>2017-01-10 10:02:14 +0100
committerCarlos Camacho <ccamacho@redhat.com>2017-01-16 15:47:50 +0100
commit92e203aab60eee1d7f99d244a3576f6c6363fa2e (patch)
treed6791cad46feb46a705d208fb006eb97f9d4ddcc /overcloud.j2.yaml
parentfa45e05f5095dabfcb1a8de396b8281b026c13b8 (diff)
Fix for AllNodesExtraConfig and fix environment files to create swap files/partitions
This submission: - Fix an error in the AllNodesExtraConfig resource. (Can't merge servers multiple times). - Add environment files to deploy swap file/partition without manual edit over the templates. - If a swap partition is mounted without having it available the deployment will fail, the fix checks that if the partition is not created then the deployment continues. - Removing empty extra lines in swap templates. - Adjust description and remove unnecessary comments in swap templates. Closes-Bug: 1652184 Change-Id: I828bbbbd4c178956aac74af49f80fcd4f62fa16b
Diffstat (limited to 'overcloud.j2.yaml')
-rw-r--r--overcloud.j2.yaml3
1 files changed, 2 insertions, 1 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index 4a3e4cd0..f93c19a3 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -593,8 +593,9 @@ resources:
- {{role.name}}AllNodesValidationDeployment
{% endfor %}
properties:
+ servers:
{% for role in roles %}
- servers: {get_attr: [{{role.name}}, attributes, nova_server_resource]}
+ {{role.name}}: {get_attr: [{{role.name}}, attributes, nova_server_resource]}
{% endfor %}
# Upgrade steps for all roles