Merge "Add disable_upgrade_deployment flag to roles_data.yaml"
This commit is contained in:
commit
76c35757c9
@ -31,19 +31,23 @@ resources:
|
||||
{% if step > 0 %}
|
||||
depends_on:
|
||||
{% for dep in roles %}
|
||||
{% if not dep.disable_upgrade_deployment|default(false) %}
|
||||
- {{dep.name}}Upgrade_Step{{step -1}}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
properties:
|
||||
UpgradeStepConfig: {get_param: [role_data, {{role.name}}, upgrade_tasks]}
|
||||
step: {{step}}
|
||||
|
||||
{% if not role.disable_upgrade_deployment|default(false) %}
|
||||
{{role.name}}Upgrade_Step{{step}}:
|
||||
type: OS::Heat::StructuredDeploymentGroup
|
||||
{% if step > 0 %}
|
||||
depends_on:
|
||||
{% for dep in roles %}
|
||||
{% if not dep.disable_upgrade_deployment|default(false) %}
|
||||
- {{dep.name}}Upgrade_Step{{step -1}}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
properties:
|
||||
@ -53,6 +57,7 @@ resources:
|
||||
input_values:
|
||||
role: {{role.name}}
|
||||
update_identifier: {get_param: UpdateIdentifier}
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% endfor %}
|
||||
|
||||
|
@ -17,6 +17,9 @@
|
||||
# disable_constraints: (boolean) optional, whether to disable Nova and Glance
|
||||
# constraints for each role specified in the templates.
|
||||
#
|
||||
# disable_upgrade_deployment: (boolean) optional, whether to run the composable upgrade
|
||||
# steps for all services that are deployed on the particular role.
|
||||
#
|
||||
# ServicesDefault: (list) optional default list of services to be deployed
|
||||
# on the role, defaults to an empty list. Sets the default for the
|
||||
# {{role.name}}Services parameter in overcloud.yaml
|
||||
@ -109,6 +112,7 @@
|
||||
- name: Compute
|
||||
CountDefault: 1
|
||||
HostnameFormatDefault: '%stackname%-novacompute-%index%'
|
||||
disable_upgrade_deployment: True
|
||||
ServicesDefault:
|
||||
- OS::TripleO::Services::CACerts
|
||||
- OS::TripleO::Services::CephClient
|
||||
@ -145,6 +149,7 @@
|
||||
- OS::TripleO::Services::FluentdClient
|
||||
|
||||
- name: ObjectStorage
|
||||
disable_upgrade_deployment: True
|
||||
ServicesDefault:
|
||||
- OS::TripleO::Services::CACerts
|
||||
- OS::TripleO::Services::Kernel
|
||||
@ -159,6 +164,7 @@
|
||||
- OS::TripleO::Services::FluentdClient
|
||||
|
||||
- name: CephStorage
|
||||
disable_upgrade_deployment: True
|
||||
ServicesDefault:
|
||||
- OS::TripleO::Services::CACerts
|
||||
- OS::TripleO::Services::CephOSD
|
||||
|
Loading…
x
Reference in New Issue
Block a user