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 "Remove hardcoded enable_load_balancer from Controller role"
[apex-tripleo-heat-templates.git]
/
extraconfig
/
all_nodes
/
swap.j2.yaml
diff --git
a/extraconfig/all_nodes/swap.j2.yaml
b/extraconfig/all_nodes/swap.j2.yaml
index
9714908
..
e19fc21
100644
(file)
--- a/
extraconfig/all_nodes/swap.j2.yaml
+++ b/
extraconfig/all_nodes/swap.j2.yaml
@@
-1,11
+1,7
@@
-heat_template_version:
2014-10-16
+heat_template_version:
pike
-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
parameters:
servers:
type: json
@@
-18,9
+14,7
@@
parameters:
description: Full path to location of swap file
default: '/swap'
description: Full path to location of swap file
default: '/swap'
-
resources:
resources:
-
SwapConfig:
type: OS::Heat::SoftwareConfig
properties:
SwapConfig:
type: OS::Heat::SoftwareConfig
properties:
@@
-50,7
+44,7
@@
resources:
type: OS::Heat::SoftwareDeploymentGroup
properties:
config: {get_resource: SwapConfig}
type: OS::Heat::SoftwareDeploymentGroup
properties:
config: {get_resource: SwapConfig}
- servers: {get_param:
servers, {{role.name}}
}
+ servers: {get_param:
[servers, {{role.name}}]
}
input_values:
swap_size_megabytes: {get_param: swap_size_megabytes}
swap_path: {get_param: swap_path}
input_values:
swap_size_megabytes: {get_param: swap_size_megabytes}
swap_path: {get_param: swap_path}