9393a3e2a5
This issue was spotted during major upgrade where we had calls like this: servers: {get_param: servers, Controller} These get_param calls are hanging indefinitely and make the whole upgrade end in a timeout. We need to put brackets around the get_param function when there are multiple arguments: http://docs.openstack.org/developer/heat/template_guide/hot_spec.html#get-param This is already done in most of the tree, and the few places where this was not happening were parts not under CI. After this change the following grep returns only one false positive: grep -ir get_param: |grep -v -- '\[' |grep ',' Change-Id: I65b23bb44f37b93e017dd15a5212939ffac76614 Closes-Bug: #1626628
45 lines
1.2 KiB
YAML
45 lines
1.2 KiB
YAML
heat_template_version: 2014-10-16
|
|
|
|
description: >
|
|
Extra config to add swap space to nodes.
|
|
|
|
# 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
|
|
swap_partition_label:
|
|
type: string
|
|
description: Swap partition label
|
|
default: 'swap1'
|
|
|
|
|
|
resources:
|
|
|
|
SwapConfig:
|
|
type: OS::Heat::SoftwareConfig
|
|
properties:
|
|
group: script
|
|
config: |
|
|
#!/bin/bash
|
|
set -eux
|
|
swap_partition=$(realpath /dev/disk/by-label/$swap_partition_label)
|
|
swapon $swap_partition
|
|
echo "$swap_partition swap swap defaults 0 0" >> /etc/fstab
|
|
inputs:
|
|
- name: swap_partition_label
|
|
description: Swap partition label
|
|
default: 'swap1'
|
|
|
|
{% 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_partition_label: {get_param: swap_partition_label}
|
|
actions: ["CREATE"]
|
|
{% endfor %}
|