diff options
author | Carlos Camacho <ccamacho@redhat.com> | 2017-01-10 10:02:14 +0100 |
---|---|---|
committer | Carlos Camacho <ccamacho@redhat.com> | 2017-01-16 15:47:50 +0100 |
commit | 92e203aab60eee1d7f99d244a3576f6c6363fa2e (patch) | |
tree | d6791cad46feb46a705d208fb006eb97f9d4ddcc /extraconfig/all_nodes/swap.j2.yaml | |
parent | fa45e05f5095dabfcb1a8de396b8281b026c13b8 (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 'extraconfig/all_nodes/swap.j2.yaml')
-rw-r--r-- | extraconfig/all_nodes/swap.j2.yaml | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/extraconfig/all_nodes/swap.j2.yaml b/extraconfig/all_nodes/swap.j2.yaml index e8cd4c90..044f817c 100644 --- a/extraconfig/all_nodes/swap.j2.yaml +++ b/extraconfig/all_nodes/swap.j2.yaml @@ -1,11 +1,7 @@ heat_template_version: ocata -description: > - Extra config to add swap space to nodes. +description: Template file to add a swap file to a node. -# Parameters passed from the parent template - note if you maintain -# out-of-tree templates they may require additional parameters if the -# in-tree templates add a new role. parameters: servers: type: json @@ -18,9 +14,7 @@ parameters: description: Full path to location of swap file default: '/swap' - resources: - SwapConfig: type: OS::Heat::SoftwareConfig properties: |