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 "Add support for "neutron" Ironic networking plugin"
[apex-tripleo-heat-templates.git]
/
overcloud.j2.yaml
diff --git
a/overcloud.j2.yaml
b/overcloud.j2.yaml
index
7b78011
..
a322a44
100644
(file)
--- a/
overcloud.j2.yaml
+++ b/
overcloud.j2.yaml
@@
-114,6
+114,11
@@
parameters:
description: What interface to add to the HypervisorNeutronPhysicalBridge.
type: string
description: What interface to add to the HypervisorNeutronPhysicalBridge.
type: string
+ NodeCreateBatchSize:
+ default: 30
+ description: Maxiumum batch size for creating nodes
+ type: number
+
# Jinja loop for Role in role_data.yaml
{% for role in roles %}
# Parameters generated for {{role.name}} Role
# Jinja loop for Role in role_data.yaml
{% for role in roles %}
# Parameters generated for {{role.name}} Role
@@
-339,6
+344,9
@@
resources:
{{role.name}}:
type: OS::Heat::ResourceGroup
depends_on: Networks
{{role.name}}:
type: OS::Heat::ResourceGroup
depends_on: Networks
+ update_policy:
+ batch_create:
+ max_batch_size: {get_param: NodeCreateBatchSize}
properties:
count: {get_param: {{role.name}}Count}
removal_policies: {get_param: {{role.name}}RemovalPolicies}
properties:
count: {get_param: {{role.name}}Count}
removal_policies: {get_param: {{role.name}}RemovalPolicies}
@@
-398,7
+406,7
@@
resources:
-
{% for role in roles %}
- list_join:
-
{% for role in roles %}
- list_join:
- - "
\n
"
+ - ""
- {get_attr: [{{role.name}}, hosts_entry]}
{% endfor %}
- {get_attr: [{{role.name}}, hosts_entry]}
{% endfor %}
@@
-581,22
+589,22
@@
resources:
- ' '
- - yaql:
expression: coalesce($.data, []).first(null)
- ' '
- - yaql:
expression: coalesce($.data, []).first(null)
- data: {get_attr: [
Controller
, external_ip_address]}
+ data: {get_attr: [
{{primary_role_name}}
, external_ip_address]}
- yaql:
expression: coalesce($.data, []).first(null)
- yaql:
expression: coalesce($.data, []).first(null)
- data: {get_attr: [
Controller
, internal_api_ip_address]}
+ data: {get_attr: [
{{primary_role_name}}
, internal_api_ip_address]}
- yaql:
expression: coalesce($.data, []).first(null)
- yaql:
expression: coalesce($.data, []).first(null)
- data: {get_attr: [
Controller
, storage_ip_address]}
+ data: {get_attr: [
{{primary_role_name}}
, storage_ip_address]}
- yaql:
expression: coalesce($.data, []).first(null)
- yaql:
expression: coalesce($.data, []).first(null)
- data: {get_attr: [
Controller
, storage_mgmt_ip_address]}
+ data: {get_attr: [
{{primary_role_name}}
, storage_mgmt_ip_address]}
- yaql:
expression: coalesce($.data, []).first(null)
- yaql:
expression: coalesce($.data, []).first(null)
- data: {get_attr: [
Controller
, tenant_ip_address]}
+ data: {get_attr: [
{{primary_role_name}}
, tenant_ip_address]}
- yaql:
expression: coalesce($.data, []).first(null)
- yaql:
expression: coalesce($.data, []).first(null)
- data: {get_attr: [
Controller
, management_ip_address]}
+ data: {get_attr: [
{{primary_role_name}}
, management_ip_address]}
UpdateWorkflow:
type: OS::TripleO::Tasks::UpdateWorkflow
UpdateWorkflow:
type: OS::TripleO::Tasks::UpdateWorkflow