Merge "Make upgrade steps unconditional to fix broken dependencies"
This commit is contained in:
commit
bb7a45226e
@ -32,21 +32,6 @@ parameters:
|
||||
type: string
|
||||
hidden: true
|
||||
|
||||
conditions:
|
||||
# Conditions to disable any steps where the task list is empty
|
||||
{%- for role in roles %}
|
||||
{{role.name}}UpgradeBatchConfigEnabled:
|
||||
not:
|
||||
equals:
|
||||
- {get_param: [role_data, {{role.name}}, upgrade_batch_tasks]}
|
||||
- []
|
||||
{{role.name}}UpgradeConfigEnabled:
|
||||
not:
|
||||
equals:
|
||||
- {get_param: [role_data, {{role.name}}, upgrade_tasks]}
|
||||
- []
|
||||
{%- endfor %}
|
||||
|
||||
resources:
|
||||
|
||||
{% for role in roles if role.disable_upgrade_deployment|default(false) %}
|
||||
@ -103,7 +88,6 @@ resources:
|
||||
{%- for role in roles %}
|
||||
{{role.name}}UpgradeBatchConfig_Step{{step}}:
|
||||
type: OS::TripleO::UpgradeConfig
|
||||
condition: {{role.name}}UpgradeBatchConfigEnabled
|
||||
{%- if step > 0 %}
|
||||
depends_on:
|
||||
{%- for role_inside in enabled_roles %}
|
||||
@ -129,7 +113,6 @@ resources:
|
||||
{%- for role in enabled_roles %}
|
||||
{{role.name}}UpgradeBatch_Step{{step}}:
|
||||
type: OS::Heat::SoftwareDeploymentGroup
|
||||
condition: {{role.name}}UpgradeBatchConfigEnabled
|
||||
{%- if step > 0 %}
|
||||
depends_on:
|
||||
{%- for role_inside in enabled_roles %}
|
||||
@ -192,7 +175,6 @@ resources:
|
||||
{%- for role in roles %}
|
||||
{{role.name}}UpgradeConfig_Step{{step}}:
|
||||
type: OS::TripleO::UpgradeConfig
|
||||
condition: {{role.name}}UpgradeConfigEnabled
|
||||
# The UpgradeConfig resources could actually be created without
|
||||
# serialization, but the event output is easier to follow if we
|
||||
# do, and there should be minimal performance hit (creating the
|
||||
@ -214,7 +196,6 @@ resources:
|
||||
{%- for role in enabled_roles %}
|
||||
{{role.name}}Upgrade_Step{{step}}:
|
||||
type: OS::Heat::SoftwareDeploymentGroup
|
||||
condition: {{role.name}}UpgradeConfigEnabled
|
||||
depends_on:
|
||||
{%- for role_inside in enabled_roles %}
|
||||
{%- if step > 0 %}
|
||||
|
Loading…
x
Reference in New Issue
Block a user