openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Do not include node scale up playbook in case of new masters"

This commit is contained in:
Zuul 2018-11-16 13:02:44 +00:00 committed by Gerrit Code Review
parent a2b0f70d95 8caaee30a9
commit f190d35e52
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extraconfig/services/openshift-master.yaml
View File

@ -354,13 +354,13 @@ outputs:
- include: "{{openshift_prerequisites_playbook_path}}" - include: "{{openshift_prerequisites_playbook_path}}"
{% if tripleo_stack_action == 'UPDATE' and new_master_nodes | count > 0 %}
- include: "{{openshift_master_scaleup_playbook_path}}"
{% endif %}
{% if tripleo_stack_action == 'UPDATE' and has_new_nodes %} {% if tripleo_stack_action == 'UPDATE' and has_new_nodes %}
{% if new_master_nodes | count > 0 %}
- include: "{{openshift_master_scaleup_playbook_path}}"
{% else %}
- include: "{{openshift_worker_scaleup_playbook_path}}" - include: "{{openshift_worker_scaleup_playbook_path}}"
{% endif %} {% endif %}
{% endif %}
{% if tripleo_stack_action == 'UPDATE' and openshift_upgrade %} {% if tripleo_stack_action == 'UPDATE' and openshift_upgrade %}
- include: "{{openshift_upgrade_playbook_path}}" - include: "{{openshift_upgrade_playbook_path}}"