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 "docker/internal TLS: spawn extra container for swift's TLS proxy"
[apex-tripleo-heat-templates.git]
/
extraconfig
/
all_nodes
/
mac_hostname.j2.yaml
diff --git
a/extraconfig/all_nodes/mac_hostname.j2.yaml
b/extraconfig/all_nodes/mac_hostname.j2.yaml
index
af6aa7f
..
fcf022a
100644
(file)
--- a/
extraconfig/all_nodes/mac_hostname.j2.yaml
+++ b/
extraconfig/all_nodes/mac_hostname.j2.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
2014-10-16
+heat_template_version:
ocata
description: >
Example extra config for cluster config
description: >
Example extra config for cluster config
@@
-34,7
+34,7
@@
resources:
type: OS::Heat::SoftwareDeployments
properties:
name: CollectMacDeploymentsController
type: OS::Heat::SoftwareDeployments
properties:
name: CollectMacDeploymentsController
- servers: {get_param:
servers, {{role.name}}
}
+ servers: {get_param:
[servers, {{role.name}}]
}
config: {get_resource: CollectMacConfig}
actions: ['CREATE'] # Only do this on CREATE
{% endfor %}
config: {get_resource: CollectMacConfig}
actions: ['CREATE'] # Only do this on CREATE
{% endfor %}
@@
-63,7
+63,7
@@
resources:
type: OS::Heat::SoftwareDeployments
properties:
name: DistributeMacDeploymentsController
type: OS::Heat::SoftwareDeployments
properties:
name: DistributeMacDeploymentsController
- servers: {get_param:
servers, Controller
}
+ servers: {get_param:
[servers, Controller]
}
config: {get_resource: DistributeMacConfig}
input_values:
# FIXME(shardy): It'd be more convenient if we could join these
config: {get_resource: DistributeMacConfig}
input_values:
# FIXME(shardy): It'd be more convenient if we could join these