openstack
/
tripleo-heat-templates
Code Issues Proposed changes

use include_tasks instead of include 

Change-Id: I4aa8055fe800723b3e140f8232c9e41e769e11f3
This commit is contained in:
zhulingjie 2018-10-11 14:32:46 -04:00 committed by caoyuan
parent a79b7cb921
commit a6479d0b51
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/deploy-steps.j2
View File

@ -731,7 +731,7 @@ outputs:
any_errors_fatal: yes
become: false
tasks:
- include: external_update_steps_tasks.yaml
- include_tasks: external_update_steps_tasks.yaml
with_sequence: start=0 end={{external_update_steps_max-1}}
loop_control:
loop_var: step
@ -747,7 +747,7 @@ outputs:
any_errors_fatal: yes
become: false
tasks:
- include: external_deploy_steps_tasks.yaml
- include_tasks: external_deploy_steps_tasks.yaml
with_sequence: start=1 end={{deploy_steps_max-1}}
loop_control:
loop_var: step
@ -912,7 +912,7 @@ outputs:
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
tasks:
- include: external_upgrade_steps_tasks.yaml
- include_tasks: external_upgrade_steps_tasks.yaml
with_sequence: start=0 end={{external_upgrade_steps_max-1}}
loop_control:
loop_var: step
@ -937,7 +937,7 @@ outputs:
docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
tasks:
- include: external_deploy_steps_tasks.yaml
- include_tasks: external_deploy_steps_tasks.yaml
with_sequence: start=1 end={{deploy_steps_max-1}}
loop_control:
loop_var: step

2
extraconfig/services/kubernetes-master.yaml
View File

@ -153,7 +153,7 @@ outputs:
copy:
dest: "{{playbook_dir}}/kubespray/playbook.yml"
content: |
- include: {{ kubespray_dir|default('/usr/share/kubespray') }}/cluster.yml
- include_tasks: {{ kubespray_dir|default('/usr/share/kubespray') }}/cluster.yml
- name: set kubespray command
set_fact:
# NOTE: We could let kubespray configure docker

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

@ -441,8 +441,8 @@ outputs:
{% if tripleo_stack_action == 'CREATE' %}
# Prerequisites playbook is explicitly needed only for
# initial install
- include: "{{openshift_prerequisites_playbook_path}}"
- include: "{{openshift_ansible_playbook_path}}"
- include_tasks: "{{openshift_prerequisites_playbook_path}}"
- include_tasks: "{{openshift_ansible_playbook_path}}"
{% elif tripleo_stack_action == 'UPDATE' %}
{% if has_new_nodes %}
@ -455,16 +455,16 @@ outputs:
state: restarted
{% if new_master_nodes | count > 0 %}
# Scale up nodes (including masters)
- include: "{{openshift_master_scaleup_playbook_path}}"
- include_tasks: "{{openshift_master_scaleup_playbook_path}}"
{% else %}
# Scale up workers/infra nodes
- include: "{{openshift_worker_scaleup_playbook_path}}"
- include_tasks: "{{openshift_worker_scaleup_playbook_path}}"
{% endif %}
{% endif %}
# Re-run the deploy playbook to apply potential change
# changes to existing nodes
- include: "{{openshift_ansible_playbook_path}}"
- include_tasks: "{{openshift_ansible_playbook_path}}"
- name: Restart masters
hosts: masters
serial: 1
@ -550,7 +550,7 @@ outputs:
dest: "{{playbook_dir}}/openshift/playbook.yml"
content: |
# Scale up etcd nodes
- include: "{{openshift_etcd_scaleup_playbook_path}}"
- include_tasks: "{{openshift_etcd_scaleup_playbook_path}}"
- name: print openshift command
debug: