Merge "Rework the generated openshift-ansible playbook"
This commit is contained in:
commit
b0409666a0
@ -344,17 +344,32 @@ outputs:
|
||||
enabled: yes
|
||||
|
||||
|
||||
{% if tripleo_stack_action == 'CREATE' %}
|
||||
# Prerequisites playbook is explicitly needed only for
|
||||
# initial install
|
||||
- include: "{{openshift_prerequisites_playbook_path}}"
|
||||
- include: "{{openshift_ansible_playbook_path}}"
|
||||
|
||||
{% if tripleo_stack_action == 'UPDATE' and has_new_nodes %}
|
||||
{% elif tripleo_stack_action == 'UPDATE' %}
|
||||
{% if has_new_nodes %}
|
||||
- name: Restart dnsmasq to pick up new nodes
|
||||
hosts: all
|
||||
tasks:
|
||||
- name: Restart dnsmasq
|
||||
service:
|
||||
name: dnsmasq
|
||||
state: restarted
|
||||
{% if new_master_nodes | count > 0 %}
|
||||
# Scale up nodes (including masters)
|
||||
- include: "{{openshift_master_scaleup_playbook_path}}"
|
||||
{% else %}
|
||||
# Scale up workers/infra nodes
|
||||
- include: "{{openshift_worker_scaleup_playbook_path}}"
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
{% if tripleo_stack_action == 'CREATE' or (tripleo_stack_action == 'UPDATE' and has_new_nodes) %}
|
||||
# Re-run the deploy playbook to apply potential change
|
||||
# changes to existing nodes
|
||||
- include: "{{openshift_ansible_playbook_path}}"
|
||||
{% endif %}
|
||||
|
||||
@ -433,7 +448,7 @@ outputs:
|
||||
copy:
|
||||
dest: "{{playbook_dir}}/openshift/playbook.yml"
|
||||
content: |
|
||||
|
||||
# Scale up etcd nodes
|
||||
- include: "{{openshift_etcd_scaleup_playbook_path}}"
|
||||
|
||||
- name: print openshift command
|
||||
|
Loading…
x
Reference in New Issue
Block a user