a8d5ec2629
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
(cherry picked from commit 92e203aab6)
53 lines
1.4 KiB
YAML
53 lines
1.4 KiB
YAML
heat_template_version: 2014-10-16
|
|
|
|
description: Template file to add a swap file to a node.
|
|
|
|
parameters:
|
|
servers:
|
|
type: json
|
|
swap_size_megabytes:
|
|
type: string
|
|
description: Amount of swap space to allocate in megabytes
|
|
default: '4096'
|
|
swap_path:
|
|
type: string
|
|
description: Full path to location of swap file
|
|
default: '/swap'
|
|
|
|
resources:
|
|
SwapConfig:
|
|
type: OS::Heat::SoftwareConfig
|
|
properties:
|
|
group: script
|
|
config: |
|
|
#!/bin/bash
|
|
set -eux
|
|
if [ ! -f $swap_path ]; then
|
|
dd if=/dev/zero of=$swap_path count=$swap_size_megabytes bs=1M
|
|
chmod 0600 $swap_path
|
|
mkswap $swap_path
|
|
swapon $swap_path
|
|
else
|
|
echo "$swap_path already exists"
|
|
fi
|
|
echo "$swap_path swap swap defaults 0 0" >> /etc/fstab
|
|
inputs:
|
|
- name: swap_size_megabytes
|
|
description: Amount of swap space to allocate in megabytes
|
|
default: '4096'
|
|
- name: swap_path
|
|
description: Full path to location of swap file
|
|
default: '/swap'
|
|
|
|
{% for role in roles %}
|
|
{{role.name}}SwapDeployment:
|
|
type: OS::Heat::SoftwareDeploymentGroup
|
|
properties:
|
|
config: {get_resource: SwapConfig}
|
|
servers: {get_param: [servers, {{role.name}}]}
|
|
input_values:
|
|
swap_size_megabytes: {get_param: swap_size_megabytes}
|
|
swap_path: {get_param: swap_path}
|
|
actions: ["CREATE"]
|
|
{% endfor %}
|