Merge "Don't create ExtraConfig resources per role"
This commit is contained in:
commit
1caa1024e7
|
@ -339,28 +339,31 @@ resources:
|
||||||
expression: switch($.data = {} => "no_bootstrap_server", $.data != {} => $.data.items().orderBy($[0]).first()[1])
|
expression: switch($.data = {} => "no_bootstrap_server", $.data != {} => $.data.items().orderBy($[0]).first()[1])
|
||||||
data: {get_param: [servers, {{primary_role_name}}]}
|
data: {get_param: [servers, {{primary_role_name}}]}
|
||||||
|
|
||||||
# BEGIN CONFIG STEPS, only on roles
|
|
||||||
{%- for role in roles %}
|
|
||||||
# Note, this should be the last step to execute configuration changes.
|
# Note, this should be the last step to execute configuration changes.
|
||||||
# Ensure that all {{role.name}}ExtraConfigPost steps are executed
|
# Ensure that all ExtraConfigPost steps are executed
|
||||||
# after all the previous deployment steps.
|
# after all the previous deployment steps.
|
||||||
{{role.name}}ExtraConfigPost:
|
ExtraConfigPost:
|
||||||
condition: {{role.name}}NonZero
|
|
||||||
type: OS::TripleO::NodeExtraConfigPost
|
type: OS::TripleO::NodeExtraConfigPost
|
||||||
properties:
|
properties:
|
||||||
servers: {get_param: [servers, {{role.name}}]}
|
servers:
|
||||||
EndpointMap: {get_param: EndpointMap}
|
map_merge:
|
||||||
|
{%- for role in roles %}
|
||||||
|
- if:
|
||||||
|
- {{role.name}}NonZero
|
||||||
|
- {get_param: [servers, {{role.name}}]}
|
||||||
|
- {}
|
||||||
|
{%- endfor %}
|
||||||
|
EndpointMap: {get_param: EndpointMap}
|
||||||
|
|
||||||
|
# BEGIN CONFIG STEPS, only on roles
|
||||||
|
{%- for role in roles %}
|
||||||
# The {{role.name}}PostConfig steps are in charge of
|
# The {{role.name}}PostConfig steps are in charge of
|
||||||
# quiescing all services, i.e. in the Controller case,
|
# quiescing all services, i.e. in the Controller case,
|
||||||
# we should run a full service reload.
|
# we should run a full service reload.
|
||||||
{{role.name}}PostConfig:
|
{{role.name}}PostConfig:
|
||||||
condition: {{role.name}}NonZero
|
condition: {{role.name}}NonZero
|
||||||
type: OS::TripleO::Tasks::{{role.name}}PostConfig
|
type: OS::TripleO::Tasks::{{role.name}}PostConfig
|
||||||
depends_on:
|
depends_on: ExtraConfigPost
|
||||||
{%- for dep in roles %}
|
|
||||||
- {{dep.name}}ExtraConfigPost
|
|
||||||
{%- endfor %}
|
|
||||||
properties:
|
properties:
|
||||||
servers: {get_param: servers}
|
servers: {get_param: servers}
|
||||||
input_values:
|
input_values:
|
||||||
|
|
Loading…
Reference in New Issue